git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for previous commit
[enigma2.git]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index 3231aab3a974e3020d7bee61aaddd0bb5eddc69b..478ca46c54ae2448f99b93d9471079b3a6263319 100644
(file)
--- a/
lib/gdi/grc.h
+++ b/
lib/gdi/grc.h
@@
-7,6
+7,10
@@
gPixmap aufsetzt (und damit unbeschleunigt ist).
*/
gPixmap aufsetzt (und damit unbeschleunigt ist).
*/
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
#include <pthread.h>
#include <stack>
#include <list>
#include <pthread.h>
#include <stack>
#include <list>
@@
-54,6
+58,8
@@
struct gOpcode
flip,
notify,
flip,
notify,
+ enableSpinner, disableSpinner, incrementSpinner,
+
shutdown
} opcode;
shutdown
} opcode;
@@
-73,7
+79,7
@@
struct gOpcode
struct prenderText
{
eRect area;
struct prenderText
{
eRect area;
-
std::string
text;
+
char *
text;
int flags;
} *renderText;
int flags;
} *renderText;
@@
-134,7
+140,7
@@
struct gOpcode
} parm;
};
} parm;
};
-#define MAXSIZE
1024
+#define MAXSIZE
2048
/* gRC is the singleton which controls the fifo and dispatches commands */
class gRC: public iObject, public Object
/* gRC is the singleton which controls the fifo and dispatches commands */
class gRC: public iObject, public Object
@@
-157,6
+163,13
@@
private:
eFixedMessagePump<int> m_notify_pump;
void recv_notify(const int &i);
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:
gRC();
virtual ~gRC();
public:
gRC();
virtual ~gRC();
@@
-164,7
+177,9
@@
public:
void submit(const gOpcode &o);
Signal0<void> notify;
void submit(const gOpcode &o);
Signal0<void> notify;
-
+
+ void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+
static gRC *getInstance();
};
static gRC *getInstance();
};
@@
-181,7
+196,7
@@
class gPainter
public:
gPainter(gDC *dc, eRect rect=eRect());
virtual ~gPainter();
public:
gPainter(gDC *dc, eRect rect=eRect());
virtual ~gPainter();
-
+
void setBackgroundColor(const gColor &color);
void setForegroundColor(const gColor &color);
void setBackgroundColor(const gColor &color);
void setForegroundColor(const gColor &color);
@@
-215,7
+230,8
@@
public:
enum
{
enum
{
- BT_ALPHATEST = 1
+ BT_ALPHATEST = 1,
+ BT_ALPHABLEND = 2
};
void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
};
void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
@@
-234,8
+250,6
@@
public:
void clip(const gRegion &clip);
void clippop();
void clip(const gRegion &clip);
void clippop();
- void flush();
-
void waitVSync();
void flip();
void notify();
void waitVSync();
void flip();
void notify();
@@
-248,12
+262,17
@@
protected:
ePtr<gPixmap> m_pixmap;
gColor m_foreground_color, m_background_color;
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<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);
public:
virtual void exec(gOpcode *opcode);
gDC(gPixmap *pixmap);
@@
-263,6
+282,12
@@
public:
int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
gRGB getRGB(gColor col);
virtual eSize size() { return m_pixmap->size(); }
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
};
#endif