Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
buttons.c ecompmgr.c ecompmgr.h setup.c
Log Message:
Minor fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.36.2.20
retrieving revision 1.36.2.21
diff -u -3 -r1.36.2.20 -r1.36.2.21
--- buttons.c 26 Dec 2004 15:58:15 -0000 1.36.2.20
+++ buttons.c 27 Dec 2004 20:30:34 -0000 1.36.2.21
@@ -21,6 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
+#include "ecompmgr.h" /* FIXME - Remove */
#define BUTTON_EVENT_MASK \
(ExposureMask | KeyPressMask | KeyReleaseMask | \
@@ -661,11 +662,8 @@
static void
ButtonEventExpose(Button * b, XEvent * ev __UNUSED__)
{
-#if !USE_COMPOSITE /* FIXME - needed only to draw text */
- ButtonDraw(b);
-#else
- b = NULL;
-#endif
+ if (!ECompMgrActive()) /* FIXME - Remove */
+ ButtonDraw(b);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecompmgr.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -3 -r1.1.2.14 -r1.1.2.15
--- ecompmgr.c 26 Dec 2004 15:58:16 -0000 1.1.2.14
+++ ecompmgr.c 27 Dec 2004 20:30:34 -0000 1.1.2.15
@@ -1858,6 +1858,12 @@
}
}
+int
+ECompMgrActive(void) /* FIXME - Remove */
+{
+ return Mode_compmgr.active;
+}
+
/*
* Event handlers
*/
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecompmgr.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ecompmgr.h 26 Dec 2004 15:58:16 -0000 1.1.2.6
+++ ecompmgr.h 27 Dec 2004 20:30:34 -0000 1.1.2.7
@@ -9,6 +9,7 @@
int shadow;
} cfg_composite;
+int ECompMgrActive(void); /* FIXME - Remove */
void ECompMgrParseArgs(const char *args);
void ECompMgrWinNew(EObj * eo);
@@ -24,6 +25,8 @@
#else
+#define ECompMgrActive() 0 /* FIXME - Remove */
+
#define ECompMgrWinDel(eo, gone, do_fade)
#define ExMoveResizeWindow(eo, x, y, w, h) EMoveResizeWindow(disp, (eo)->win,
x, y, w, h)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.139.2.19
retrieving revision 1.139.2.20
diff -u -3 -r1.139.2.19 -r1.139.2.20
--- setup.c 8 Dec 2004 20:06:16 -0000 1.139.2.19
+++ setup.c 27 Dec 2004 20:30:34 -0000 1.139.2.20
@@ -258,6 +258,10 @@
xch->res_class = (char *)"Enlightenment";
XSetClassHint(disp, VRoot.win, xch);
XFree(xch);
+
+ /* Enable eesh and edox to pix up the virtual root */
+ Esnprintf(buf, sizeof(buf), "%#lx", VRoot.win);
+ Esetenv("ENL_WM_ROOT", buf, 1);
}
else
{
@@ -266,9 +270,6 @@
VRoot.h = RRoot.h;
}
- Esnprintf(buf, sizeof(buf), "%#lx", VRoot.win);
- Esetenv("ENL_WM_ROOT", buf, 1);
-
/* initialise imlib */
imlib_set_cache_size(2048 * 1024);
imlib_set_font_cache_size(512 * 1024);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
