Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

[enigma2.git] / lib / gdi / grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 574391789c70d39ebf3bcefc9a8e998c8e157275..7071425ef6ce7e968b96e239c35b4db5cc365e1f 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,13 +7,17 @@
        gPixmap aufsetzt (und damit unbeschleunigt ist).
 */
 
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
 #include <pthread.h>
 #include <stack>
 #include <list>
 
 #include <string>
-#include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
+#include <lib/base/message.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
@@ -50,7 +54,13 @@ struct gOpcode
                
                flush,
                
-               end,shutdown
+               waitVSync,
+               flip,
+               notify,
+               
+               enableSpinner, disableSpinner, incrementSpinner,
+               
+               shutdown
        } opcode;
 
        gDC *dc;
@@ -69,7 +79,7 @@ struct gOpcode
                struct prenderText
                {
                        eRect area;
-                       std::string text;
+                       char *text;
                        int flags;
                } *renderText;
 
@@ -128,42 +138,47 @@ struct gOpcode
                        int rel;
                } *setOffset;
        } parm;
-
-       int flags;
 };
 
+#define MAXSIZE 2048
+
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public iObject
+class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+       DECLARE_REF(gRC);
+       friend class gPainter;
        static gRC *instance;
-       
+
+#ifndef SYNC_PAINT
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
+       pthread_mutex_t mutex;
+       pthread_cond_t cond;
+#endif
        void *thread();
 
-       queueRingBuffer<gOpcode> queue;
+       gOpcode queue[MAXSIZE];
+       int rp, wp;
+
+       eFixedMessagePump<int> m_notify_pump;
+       void recv_notify(const int &i);
+
+       ePtr<gDC> m_spinner_dc;
+       int m_spinner_enabled;
+       
+       void enableSpinner();
+       void disableSpinner();
+
 public:
-       eLock queuelock;
        gRC();
        virtual ~gRC();
 
-       void submit(const gOpcode &o)
-       {
-               static int collected=0;
-               queue.enqueue(o);
-               collected++;
-//             if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
-               {
-                       queuelock.unlock(collected);
-#ifdef SYNC_PAINT
-                       thread();
-#endif
-                       collected=0;
-               }
-       }
+       void submit(const gOpcode &o);
 
+       Signal0<void> notify;
+       
+       void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+       
        static gRC *getInstance();
 };
 
@@ -180,7 +195,7 @@ class gPainter
 public:
        gPainter(gDC *dc, eRect rect=eRect());
        virtual ~gPainter();
-
+       
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
@@ -211,10 +226,17 @@ public:
        void fill(const gRegion &area);
        
        void clear();
-       
+
+       enum
+       {
+               BT_ALPHATEST = 1,
+               BT_ALPHABLEND = 2
+       };
+
        void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
        void setPalette(gRGB *colors, int start=0, int len=256);
+       void setPalette(gPixmap *source);
        void mergePalette(gPixmap *target);
        
        void line(ePoint start, ePoint end);
@@ -227,22 +249,29 @@ public:
        void clip(const gRegion &clip);
        void clippop();
 
-       void flush();
+       void waitVSync();
+       void flip();
+       void notify();
 };
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+       DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
        gColor m_foreground_color, m_background_color;
+       gRGB m_foreground_color_rgb, m_background_color_rgb;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
        
        std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
+       ePtr<gPixmap> m_spinner_saved, m_spinner_temp;
+       ePtr<gPixmap> *m_spinner_pic;
+       eRect m_spinner_pos;
+       int m_spinner_num, m_spinner_i;
 public:
        virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
@@ -252,6 +281,12 @@ public:
        int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
        gRGB getRGB(gColor col);
        virtual eSize size() { return m_pixmap->size(); }
+       virtual int islocked() { return 0; }
+       
+       void enableSpinner();
+       void disableSpinner();
+       void incrementSpinner();
+       void setSpinner(eRect pos, ePtr<gPixmap> *pic, int len);
 };
 
 #endif