Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c desktops.h
Log Message:
Fix setting no background.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -3 -r1.209 -r1.210
--- desktops.c 4 Dec 2005 23:53:20 -0000 1.209
+++ desktops.c 6 Dec 2005 18:54:28 -0000 1.210
@@ -517,6 +517,16 @@
Efree(dsk);
}
+Window
+DeskGetBackgroundWin(const Desk * dsk)
+{
+ if (!dsk)
+ return VRoot.win;
+ if (!dsk->bg.bg || !dsk->bg.o)
+ return EoGetWin(dsk);
+ return EobjGetWin(dsk->bg.o);
+}
+
void
DeskBackgroundAssign(unsigned int desk, Background * bg)
{
@@ -537,6 +547,19 @@
{
Window win;
+ if (dsk->bg.o != EoObj(dsk))
+ {
+ if (dsk->bg.bg)
+ {
+ EobjMap(dsk->bg.o, 0);
+ }
+ else
+ {
+ EobjUnmap(dsk->bg.o);
+ return;
+ }
+ }
+
win = EobjGetWin(dsk->bg.o);
if (dsk->viewable)
@@ -605,23 +628,24 @@
dsk->viewable, EoGetW(dsk), EoGetH(dsk));
bg = dsk->bg.bg;
- if (!bg)
- return;
+ if (bg)
+ {
+ pmap = BackgroundGetPixmap(bg);
+ pixel = 0;
- pmap = BackgroundGetPixmap(bg);
- pixel = 0;
- if (dsk->bg.isset && dsk->bg.pmap == pmap)
- return;
+ if (dsk->bg.isset && dsk->bg.pmap == pmap)
+ return;
- if (pmap == None)
- BackgroundRealize(bg, EoGetWin(dsk), EoGetW(dsk), EoGetH(dsk), 1,
- &pmap, &pixel);
+ if (pmap == None)
+ BackgroundRealize(bg, EoGetWin(dsk), EoGetW(dsk), EoGetH(dsk), 1,
+ &pmap, &pixel);
- if (pmap != None && pmap != dsk->bg.pmap)
- BackgroundPixmapSet(dsk->bg.bg, pmap);
+ if (pmap != None && pmap != dsk->bg.pmap)
+ BackgroundPixmapSet(dsk->bg.bg, pmap);
- dsk->bg.pmap = pmap;
- dsk->bg.pixel = pixel;
+ dsk->bg.pmap = pmap;
+ dsk->bg.pixel = pixel;
+ }
dsk->bg.isset = 1;
DeskBackgroundConfigure(dsk);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- desktops.h 1 Dec 2005 23:28:13 -0000 1.18
+++ desktops.h 6 Dec 2005 18:54:28 -0000 1.19
@@ -67,11 +67,13 @@
void DeskGoto(Desk * dsk);
void DeskGotoNum(unsigned int desk);
void DeskRestack(Desk * dsk);
+Window DeskGetBackgroundWin(const Desk * dsk);
void DeskBackgroundAssign(unsigned int desk,
struct _background *bg);
struct _background *DeskBackgroundGet(const Desk * dsk);
void DeskBackgroundSet(Desk * dsk, struct _background *bg);
+
void DesksBackgroundFree(struct _background *bg, int force);
void DesksBackgroundRefresh(struct _background *bg);
-------------------------------------------------------
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
