git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into tmbinc/FixTimingBugs
[enigma2.git]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index f931046a88016f1a79d96aaea1dcc953645aa1a1..7071425ef6ce7e968b96e239c35b4db5cc365e1f 100644
(file)
--- a/
lib/gdi/grc.h
+++ b/
lib/gdi/grc.h
@@
-58,6
+58,8
@@
struct gOpcode
flip,
notify,
flip,
notify,
+ enableSpinner, disableSpinner, incrementSpinner,
+
shutdown
} opcode;
shutdown
} opcode;
@@
-138,13
+140,12
@@
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
{
-DECLARE_REF(gRC);
-private:
+ DECLARE_REF(gRC);
friend class gPainter;
static gRC *instance;
friend class gPainter;
static gRC *instance;
@@
-161,6
+162,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();
@@
-168,7
+176,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();
};
@@
-219,7
+229,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);
@@
-238,8
+249,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();
@@
-247,7
+256,7
@@
public:
class gDC: public iObject
{
class gDC: public iObject
{
-DECLARE_REF(gDC);
+
DECLARE_REF(gDC);
protected:
ePtr<gPixmap> m_pixmap;
protected:
ePtr<gPixmap> m_pixmap;
@@
-259,6
+268,10
@@
protected:
std::stack<gRegion> m_clip_stack;
gRegion m_current_clip;
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);
@@
-269,6
+282,11
@@
public:
gRGB getRGB(gColor col);
virtual eSize size() { return m_pixmap->size(); }
virtual int islocked() { 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