Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c desktops.h ecompmgr.c
Log Message:
Add window holding desk 0 (root) background.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- desktops.c 1 Dec 2005 21:25:42 -0000 1.206
+++ desktops.c 1 Dec 2005 23:28:13 -0000 1.207
@@ -363,6 +363,9 @@
{
long event_mask;
XWindowAttributes xwa;
+ Window win;
+
+ win = EobjGetWin(dsk->bg.o);
if (mode)
{
@@ -370,14 +373,14 @@
}
else
{
- EGetWindowAttributes(EoGetWin(dsk), &xwa);
+ EGetWindowAttributes(win, &xwa);
dsk->event_mask = xwa.your_event_mask | EDESK_EVENT_MASK;
event_mask =
EnterWindowMask | LeaveWindowMask |
PropertyChangeMask | SubstructureRedirectMask |
ButtonPressMask | ButtonReleaseMask;
}
- ESelectInput(EoGetWin(dsk), event_mask);
+ ESelectInput(win, event_mask);
}
static void
@@ -445,10 +448,22 @@
EoSetShadow(dsk, 0);
if (desk == 0)
{
+ EObj *eo;
+
desks.current = dsk;
+
+ eo = EobjWindowCreate(EOBJ_TYPE_MISC, 0, 0, VRoot.w, VRoot.h,
+ 0, "Root-bg");
+ eo->floating = 0;
+ eo->fade = eo->shadow = 0;
+ EobjSetLayer(eo, 0);
+ EobjMap(eo, 0);
+ dsk->bg.o = eo;
+ EventCallbackRegister(EobjGetWin(eo), 0, DeskHandleEvents, dsk);
}
else
{
+ dsk->bg.o = EoObj(dsk);
EoSetFloating(dsk, 1);
EoSetLayer(dsk, 0);
#if 0 /* TBD */
@@ -510,7 +525,7 @@
{
Window win;
- win = EoGetWin(dsk);
+ win = EobjGetWin(dsk->bg.o);
if (dsk->viewable)
{
@@ -523,12 +538,12 @@
EClearWindow(win);
}
- HintsSetRootInfo(win, dsk->bg.pmap, dsk->bg.pixel);
+ HintsSetRootInfo(EoGetWin(dsk), dsk->bg.pmap, dsk->bg.pixel);
}
else
{
if (!Conf.hints.set_xroot_info_on_root_window)
- HintsSetRootInfo(win, None, 0);
+ HintsSetRootInfo(EoGetWin(dsk), None, 0);
if (!ECompMgrDeskConfigure(dsk))
{
@@ -678,6 +693,7 @@
if (dsk->num == 0)
{
EoSync(dsk);
+ EobjMoveResize(dsk->bg.o, 0, 0, w, h);
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- desktops.h 1 Dec 2005 21:25:42 -0000 1.17
+++ desktops.h 1 Dec 2005 23:28:13 -0000 1.18
@@ -44,6 +44,7 @@
struct
{
struct _background *bg;
+ EObj *o;
Pixmap pmap;
unsigned long pixel;
char isset;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- ecompmgr.c 1 Dec 2005 21:25:42 -0000 1.83
+++ ecompmgr.c 1 Dec 2005 23:28:13 -0000 1.84
@@ -1345,7 +1345,7 @@
}
if (cw->pixmap == None && eo->shown &&
- (Mode_compmgr.use_pixmap || Conf_compmgr.fading.enable))
+ (Mode_compmgr.use_pixmap || (eo->fade && Conf_compmgr.fading.enable)))
{
cw->pixmap = XCompositeNameWindowPixmap(disp, eo->win);
D2printf("ECompMgrWinSetPicts %#lx: Pmap=%#lx\n", eo->win, cw->pixmap);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
