X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3af66122574386a2856e83ba9c5d73d27a6f3710..9925392e576717cc0df070ace822a6f392808bb7:/lib/service/listboxservice.h

diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index d5241933..d64805c5 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -5,7 +5,6 @@
 #include <lib/service/iservice.h>
 
 #include <set>
-class eServiceCenter;
 
 class eListboxServiceContent: public virtual iListboxContent
 {
@@ -14,14 +13,41 @@ public:
 	eListboxServiceContent();
 	void setRoot(const eServiceReference &ref);
 	void getCurrent(eServiceReference &ref);
-	
+
 		/* support for marked services */
 	void initMarked();
 	void addMarked(const eServiceReference &ref);
 	void removeMarked(const eServiceReference &ref);
 	int isMarked(const eServiceReference &ref);
+
+		/* this is NOT thread safe! */
+	void markedQueryStart();
+	int markedQueryNext(eServiceReference &ref);
+
 	int lookupService(const eServiceReference &ref);
+	
+	enum {
+		visModeSimple,
+		visModeComplex
+	};
+	
+	void setVisualMode(int mode);
+	
+		/* only in complex mode: */
+	enum {
+		celServiceName,
+		celServiceNumber,
+		celIcon,
+		celServiceInfo, // "now" event
+		celElements
+	};
+	
+	void setElementPosition(int element, eRect where);
+	void setElementFont(int element, gFont *font);
+	
+	void sort();
 
+	int setCurrentMarked(bool);
 
 protected:
 	void cursorHome();
@@ -30,7 +56,7 @@ protected:
 	int cursorValid();
 	int cursorSet(int n);
 	int cursorGet();
-	
+
 	void cursorSave();
 	void cursorRestore();
 	int size();
@@ -40,6 +66,11 @@ protected:
 	
 		/* the following functions always refer to the selected item */
 	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
+	
+	int m_visual_mode;
+		/* for complex mode */
+	eRect m_element_position[celElements];
+	ePtr<gFont> m_element_font[celElements];
 private:
 	typedef std::list<eServiceReference> list;
 	
@@ -50,12 +81,17 @@ private:
 	int m_size;
 	
 	eSize m_itemsize;
-	ePtr<eServiceCenter> m_service_center;
+	ePtr<iServiceHandler> m_service_center;
 	
 	eServiceReference m_root;
-	
+
 		/* support for marked services */
 	std::set<eServiceReference> m_marked;
+	std::set<eServiceReference>::const_iterator m_marked_iterator;
+
+		/* support for movemode */
+	bool m_current_marked;
+	list::iterator m_swap;
 };
 
 #endif