Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c desktops.h
Log Message:
Fix build without composite.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -3 -r1.226 -r1.227
--- desktops.c 27 Feb 2006 19:14:25 -0000 1.226
+++ desktops.c 27 Feb 2006 21:25:38 -0000 1.227
@@ -389,8 +389,10 @@
static Desk *
DeskCreate(int desk, int configure)
{
- Desk *dsk;
+#if USE_COMPOSITE
EObj *eo;
+#endif
+ Desk *dsk;
Window win;
char buf[64];
@@ -415,6 +417,7 @@
{
desks.current = dsk;
#if !USE_BG_WIN_ON_ALL_DESKS /* TBD - Use per virtual root bg window? */
+#if USE_COMPOSITE
/* Add background window */
eo = EobjWindowCreate(EOBJ_TYPE_ROOT_BG, 0, 0, VRoot.w, VRoot.h,
0, "Root-bg");
@@ -423,6 +426,7 @@
EobjSetLayer(eo, 0);
EventCallbackRegister(EobjGetWin(eo), 0, DeskHandleEvents, dsk);
dsk->bg.o_bg = eo;
+#endif
if (Mode.root.ext_pmap_valid)
dsk->bg.pmap_set = Mode.root.ext_pmap;
#endif
@@ -440,6 +444,7 @@
}
#if USE_BG_WIN_ON_ALL_DESKS /* TBD - Use per virtual root bg window? */
+#if USE_COMPOSITE
/* Add background window */
Esnprintf(buf, sizeof(buf), "Desk-bg-%d", desk);
eo = EobjWindowCreate(EOBJ_TYPE_MISC, 0, 0, VRoot.w, VRoot.h, 0, buf);
@@ -450,6 +455,7 @@
dsk->bg.o_bg = eo;
EventCallbackRegister(EobjGetWin(eo), 0, DeskHandleEvents, dsk);
#endif
+#endif
HintsSetRootHints(EoGetWin(dsk));
@@ -464,12 +470,14 @@
{
ModulesSignal(ESIGNAL_DESK_REMOVED, dsk);
+#if USE_COMPOSITE
if (dsk->bg.o_bg)
{
EventCallbackUnregister(EobjGetWin(dsk->bg.o_bg), 0, DeskHandleEvents,
dsk);
EobjWindowDestroy(dsk->bg.o_bg);
}
+#endif
EventCallbackUnregister(EoGetWin(dsk), 0, DeskHandleEvents, dsk);
DeskControlsDestroy(dsk, 1);
@@ -521,6 +529,7 @@
BackgroundIsNone(dsk->bg.bg), pmap, dsk->bg.pmap_set, pixel,
dsk->bg.pixel);
+#if USE_COMPOSITE
if (dsk->bg.o_bg)
{
if (ECompMgrIsActive())
@@ -534,6 +543,7 @@
EobjUnmap(dsk->bg.o_bg);
}
}
+#endif
win = EobjGetWin(dsk->bg.o);
@@ -717,8 +727,10 @@
x = (dsk->viewable) ? EoGetX(dsk) : VRoot.w;
EoMoveResize(dsk, x, 0, w, h);
}
+#if USE_COMPOSITE
if (dsk->bg.o_bg)
EobjMoveResize(dsk->bg.o_bg, 0, 0, w, h);
+#endif
DeskBackgroundRefresh(dsk, DESK_BG_REFRESH);
DeskControlsDestroy(dsk, 1);
DeskControlsCreate(dsk);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- desktops.h 27 Feb 2006 19:14:25 -0000 1.23
+++ desktops.h 27 Feb 2006 21:25:38 -0000 1.24
@@ -52,7 +52,9 @@
{
struct _background *bg;
EObj *o;
+#if USE_COMPOSITE
EObj *o_bg;
+#endif
Pixmap pmap;
Pixmap pmap_set;
unsigned long pixel;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
