Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c desktops.h
Log Message:
Background handling change bits.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- desktops.c 1 Dec 2005 17:00:24 -0000 1.204
+++ desktops.c 1 Dec 2005 18:30:47 -0000 1.205
@@ -475,11 +475,11 @@
DeskControlsDestroy(dsk, 1);
DeskControlsDestroy(dsk, 2);
- if (dsk->bg)
+ if (dsk->bg.bg)
{
- if (dsk->pmap != None)
- BackgroundPixmapUnset(dsk->bg, dsk->pmap);
- BackgroundDecRefcount(dsk->bg);
+ if (dsk->bg.pmap != None)
+ BackgroundPixmapUnset(dsk->bg.bg, dsk->bg.pmap);
+ BackgroundDecRefcount(dsk->bg.bg);
}
EoFini(dsk);
@@ -500,7 +500,7 @@
Background *
DeskBackgroundGet(const Desk * dsk)
{
- return (dsk) ? dsk->bg : NULL;
+ return (dsk) ? dsk->bg.bg : NULL;
}
static void
@@ -522,7 +522,7 @@
}
if (pmap != None)
- BackgroundPixmapSet(dsk->bg, pmap);
+ BackgroundPixmapSet(dsk->bg.bg, pmap);
HintsSetRootInfo(win, pmap, pixel);
}
else
@@ -540,10 +540,10 @@
static void
DeskBackgroundFree(Desk * dsk, int force)
{
- if (!dsk->bg_isset)
+ if (!dsk->bg.isset)
return;
- dsk->bg_isset = 0;
+ dsk->bg.isset = 0;
if (EventDebug(EDBUG_TYPE_DESKS))
Eprintf("DeskBackgroundFree %d v=%d force=%d\n", dsk->num,
@@ -551,10 +551,10 @@
if (!dsk->viewable || force)
{
- if (dsk->pmap != None)
+ if (dsk->bg.pmap != None)
{
- BackgroundPixmapUnset(dsk->bg, dsk->pmap);
- dsk->pmap = None;
+ BackgroundPixmapUnset(dsk->bg.bg, dsk->bg.pmap);
+ dsk->bg.pmap = None;
}
}
@@ -576,13 +576,13 @@
Eprintf("DeskBackgroundRefresh %d v=%d - %dx%d\n", dsk->num,
dsk->viewable, EoGetW(dsk), EoGetH(dsk));
- bg = dsk->bg;
+ bg = dsk->bg.bg;
if (!bg)
return;
pmap = BackgroundGetPixmap(bg);
pixel = 0;
- if (dsk->bg_isset && dsk->pmap == pmap)
+ if (dsk->bg.isset && dsk->bg.pmap == pmap)
return;
if (pmap == None)
@@ -590,8 +590,8 @@
&pmap, &pixel);
DeskBackgroundConfigure(dsk, 1, pmap, pixel);
- dsk->pmap = pmap;
- dsk->bg_isset = 1;
+ dsk->bg.pmap = pmap;
+ dsk->bg.isset = 1;
}
static void
@@ -612,18 +612,18 @@
if (bg && BackgroundIsNone(bg))
bg = NULL;
- if (dsk->bg != bg)
+ if (dsk->bg.bg != bg)
{
- if (dsk->bg)
+ if (dsk->bg.bg)
{
DeskBackgroundFree(dsk, 1);
- BackgroundDecRefcount(dsk->bg);
+ BackgroundDecRefcount(dsk->bg.bg);
}
if (bg)
BackgroundIncRefcount(bg);
}
- dsk->bg = bg;
+ dsk->bg.bg = bg;
if (dsk->viewable)
DeskBackgroundRefresh(dsk);
@@ -640,7 +640,7 @@
for (i = 0; i < Conf.desks.num; i++)
{
dsk = _DeskGet(i);
- if (dsk->bg != bg)
+ if (dsk->bg.bg != bg)
continue;
DeskBackgroundFree(dsk, force);
}
@@ -655,7 +655,7 @@
for (i = 0; i < Conf.desks.num; i++)
{
dsk = _DeskGet(i);
- if (dsk->bg != bg)
+ if (dsk->bg.bg != bg)
continue;
DeskBackgroundUpdate(dsk);
}
@@ -1068,7 +1068,7 @@
{
dd = _DeskGet(desks.order[i]);
if (dd->viewable)
- BackgroundTouch(dd->bg);
+ BackgroundTouch(dd->bg.bg);
dd->viewable = 0;
}
}
@@ -1086,7 +1086,7 @@
}
else if (dd->viewable && !v)
{
- BackgroundTouch(dd->bg);
+ BackgroundTouch(dd->bg.bg);
dd->viewable = 0;
}
@@ -1121,7 +1121,7 @@
dsk = _DeskGet(desk);
if (dsk->viewable)
- BackgroundTouch(dsk->bg);
+ BackgroundTouch(dsk->bg.bg);
dsk->viewable = 0;
EoMove(dsk, VRoot.w, 0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- desktops.h 27 Nov 2005 13:11:05 -0000 1.15
+++ desktops.h 1 Dec 2005 18:30:47 -0000 1.16
@@ -37,13 +37,16 @@
EObj o;
unsigned int num;
char viewable;
- char bg_isset;
- struct _background *bg;
struct _button *tag;
int current_area_x;
int current_area_y;
long event_mask;
- Pixmap pmap;
+ struct
+ {
+ struct _background *bg;
+ Pixmap pmap;
+ char isset;
+ } bg;
struct
{
int dirty;
-------------------------------------------------------
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
