Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
ecompmgr.c
Log Message:
Cleanups, fix start/stop.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecompmgr.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -3 -r1.1.2.10 -r1.1.2.11
--- ecompmgr.c 15 Dec 2004 22:17:09 -0000 1.1.2.10
+++ ecompmgr.c 22 Dec 2004 19:52:02 -0000 1.1.2.11
@@ -98,7 +98,11 @@
#define DEBUG_EVENTS 0
-#define set_ignore(dpy, seq)
+#define INV_POS 0x01
+#define INV_SIZE 0x02
+#define INV_OPACITY 0x04
+#define INV_GEOM (INV_POS | INV_SIZE)
+#define INV_ALL (INV_POS | INV_SIZE | INV_OPACITY)
extern Atom _NET_WM_WINDOW_OPACITY;
@@ -330,14 +334,6 @@
XRenderFillRectangle(disp, PictOpSrc, pict, &c, 0, 0, 1, 1);
}
-#if xHAS_NAME_WINDOW_PIXMAP /* Do this? */
- if (Mode_compmgr.have_name_pixmap)
- {
- pmap = XCompositeNameWindowPixmap(dpy, id);
- desks[desk].bgpmap = pmap;
- }
-#endif
-
/* New background, all must be repainted */
ECompMgrDamageMerge(ERegionCreate(0, 0, VRoot.w, VRoot.h), 1);
@@ -896,11 +892,9 @@
ECmWinInfo *w = eo->cmhook;
XserverRegion border;
- set_ignore(disp, NextRequest(disp));
border = XFixesCreateRegionFromWindow(disp, eo->win, WindowRegionBounding);
/* translate this */
- set_ignore(disp, NextRequest(disp));
XFixesTranslateRegion(disp, border,
w->a.x + w->a.border_width,
w->a.y + w->a.border_width);
@@ -926,52 +920,49 @@
/* pixmap picture borderSize shadowPict borderClip - alphaPict */
static void
-ECompMgrWinInvalidateSize(ECmWinInfo * w)
+ECompMgrWinInvalidate(ECmWinInfo * w, int what)
{
Display *dpy = disp;
- if (w->extents != None)
+ if ((what & INV_GEOM) && w->extents != None)
{
XFixesDestroyRegion(dpy, w->extents);
w->extents = None;
}
#if HAS_NAME_WINDOW_PIXMAP
- if (w->pixmap != None)
+ if ((what & INV_SIZE) && w->pixmap != None)
{
XFreePixmap(dpy, w->pixmap);
w->pixmap = None;
+ if (w->picture != None)
+ {
+ XRenderFreePicture(dpy, w->picture);
+ w->picture = None;
+ }
}
#endif
- if (w->picture != None)
+ if ((what & INV_GEOM) && w->borderSize != None)
{
- set_ignore(dpy, NextRequest(dpy));
- XRenderFreePicture(dpy, w->picture);
- w->picture = None;
- }
-
- if (w->borderSize != None)
- {
- set_ignore(dpy, NextRequest(dpy));
XFixesDestroyRegion(dpy, w->borderSize);
w->borderSize = None;
}
#if ENABLE_SHADOWS
- if (w->shadow != None)
+ if ((what & INV_SIZE) && w->shadow != None)
{
XRenderFreePicture(dpy, w->shadow);
w->shadow = None;
}
- if (w->shadowPict != None)
+ if ((what & INV_SIZE) && w->shadowPict != None)
{
XRenderFreePicture(dpy, w->shadowPict);
w->shadowPict = None;
}
#endif
- if (w->borderClip != None)
+ if ((what & INV_SIZE) && w->borderClip != None)
{
XFixesDestroyRegion(dpy, w->borderClip);
w->borderClip = None;
@@ -1075,7 +1066,7 @@
w->usable = False;
#endif
- ECompMgrWinInvalidateSize(w);
+ ECompMgrWinInvalidate(w, INV_SIZE);
if (w->extents != None)
{
@@ -1118,6 +1109,54 @@
}
static void
+ECompMgrWinSetPicts(EObj * eo)
+{
+ ECmWinInfo *w = eo->cmhook;
+
+ if (w->a.class == InputOnly)
+ return;
+
+#if xHAS_NAME_WINDOW_PIXMAP /* Hmmm.. */
+ if (w->pixmap != None)
+ {
+ XFreePixmap(disp, w->pixmap);
+ w->pixmap = None;
+ if (w->picture != None)
+ {
+ XRenderFreePicture(disp, w->picture);
+ w->picture = None;
+ }
+ }
+ if (Mode_compmgr.have_name_pixmap)
+ w->pixmap = XCompositeNameWindowPixmap(disp, eo->win);
+#endif
+
+#if 0
+ if (w->picture != None)
+ {
+ XRenderFreePicture(disp, w->picture);
+ w->picture = None;
+ }
+#endif
+ if (w->picture == None)
+ {
+ XRenderPictFormat *pictfmt;
+ XRenderPictureAttributes pa;
+ Drawable draw = eo->win;
+
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w->pixmap)
+ draw = w->pixmap;
+#endif
+ pictfmt = XRenderFindVisualFormat(disp, w->a.visual);
+ pa.subwindow_mode = IncludeInferiors;
+ w->picture = XRenderCreatePicture(disp, draw,
+ pictfmt, CPSubwindowMode, &pa);
+ D2printf("New picture %#lx\n", w->picture);
+ }
+}
+
+static void
ECompMgrWinNew(EObj * eo)
{
ECmWinInfo *w;
@@ -1128,7 +1167,6 @@
D1printf("ECompMgrWinNew %#lx\n", eo->win);
- set_ignore(disp, NextRequest(disp));
if (!XGetWindowAttributes(disp, eo->win, &w->a))
{
free(w);
@@ -1141,10 +1179,7 @@
#if CAN_DO_USABLE
w->usable = False;
#endif
-#if HAS_NAME_WINDOW_PIXMAP
- w->pixmap = None;
-#endif
- w->picture = None;
+
if (w->a.class == InputOnly)
{
w->damage_sequence = 0;
@@ -1152,10 +1187,19 @@
}
else
{
+#if 0
+ XCompositeRedirectWindow(disp, eo->win, CompositeRedirectManual);
+#endif
w->damage_sequence = NextRequest(disp);
w->damage = XDamageCreate(disp, eo->win, XDamageReportNonEmpty);
}
+ w->picture = None;
+#if HAS_NAME_WINDOW_PIXMAP
+ w->pixmap = None;
+#endif
+ ECompMgrWinSetPicts(eo);
+
w->alphaPict = None;
w->borderSize = None;
w->extents = None;
@@ -1171,7 +1215,8 @@
w->borderClip = None;
/* moved mode setting to one place */
- ESelectInputAdd(disp, eo->win, PropertyChangeMask);
+ ESelectInputAdd(disp, eo->win,
+ PropertyChangeMask /* | StructureNotifyMask */ );
/* Find new window region */
w->extents = win_extents(disp, eo);
@@ -1194,7 +1239,7 @@
{
ECmWinInfo *w = eo->cmhook;
XserverRegion damage = None;
- int change_xy, change_wh, change_bw;
+ int change_xy, change_wh, change_bw, invalidate;
D1printf("ECompMgrWinConfigure %#lx %#lx\n", eo->win, w->extents);
@@ -1218,9 +1263,17 @@
w->a.height != ev->xconfigure.height;
change_bw = w->a.border_width != ev->xconfigure.border_width;
- if (change_xy || change_wh || change_bw)
- {
- ECompMgrWinInvalidateSize(w);
+ invalidate = 0;
+ if (change_xy || change_bw)
+ invalidate |= INV_POS;
+ if (change_wh || change_bw)
+ invalidate |= INV_SIZE;
+
+ if (invalidate)
+ {
+ ECompMgrWinInvalidate(w, invalidate);
+ if (invalidate & INV_SIZE)
+ ECompMgrWinSetPicts(eo);
w->a.x = ev->xconfigure.x;
w->a.y = ev->xconfigure.y;
@@ -1253,10 +1306,18 @@
ECompMgrWinInvalidateAll(ECmWinInfo * w)
{
/* Free pixmap, picture, borderSize, shadowPict, borderClip */
- ECompMgrWinInvalidateSize(w);
+ ECompMgrWinInvalidate(w, INV_ALL);
/* Free alphaPict, shadowPict */
ECompMgrWinInvalidateOpacity(w);
+
+#if 1
+ if (w->picture != None)
+ {
+ XRenderFreePicture(disp, w->picture);
+ w->picture = None;
+ }
+#endif
}
static void
@@ -1271,7 +1332,6 @@
if (w->damage != None)
{
- set_ignore(dpy, NextRequest(dpy));
XDamageDestroy(disp, w->damage);
}
@@ -1295,11 +1355,11 @@
static void
ECompMgrWinDel(EObj * eo, Bool gone, Bool do_fade)
{
-#if ENABLE_FADING
-#if HAS_NAME_WINDOW_PIXMAP
ECmWinInfo *w = eo->cmhook;
-#endif
-#endif
+
+ if (!w)
+ return;
+
D1printf("ECompMgrWinDel %#lx\n", eo->win);
#if ENABLE_FADING
@@ -1312,6 +1372,9 @@
finish_destroy_win(eo, gone);
do_fade = False;
+#if 0
+ XCompositeUnredirectWindow(disp, eo->win, CompositeRedirectManual);
+#endif
EventCallbackUnregister(eo->win, 0, ECompMgrHandleWindowEvent, eo);
}
@@ -1387,13 +1450,11 @@
if (!w->damaged)
{
parts = win_extents(dpy, eo);
- set_ignore(dpy, NextRequest(dpy));
XDamageSubtract(dpy, w->damage, None, None);
}
else
{
parts = XFixesCreateRegion(dpy, 0, 0);
- set_ignore(dpy, NextRequest(dpy));
XDamageSubtract(dpy, w->damage, None, parts);
XFixesTranslateRegion(dpy, parts,
w->a.x + w->a.border_width,
@@ -1446,7 +1507,6 @@
int i, num;
ECmWinInfo *w;
Picture pict, pbuf;
- XRenderPictFormat *pictfmt;
D2printf("ECompMgrRepaint rootBuffer=%#lx rootPicture=%#lx\n",
rootBuffer, rootPicture);
@@ -1485,26 +1545,12 @@
#endif
if (!w->damaged)
continue;
-
if (!w->picture)
- {
- XRenderPictureAttributes pa;
-
- Drawable draw = eo->win;
+ continue;
-#if HAS_NAME_WINDOW_PIXMAP
- if (Mode_compmgr.have_name_pixmap && !w->pixmap)
- w->pixmap = XCompositeNameWindowPixmap(dpy, eo->win);
-#if 0 /* ??? */
- if (w->pixmap)
- draw = w->pixmap;
-#endif
+#if 0
+ ECompMgrWinSetPicts(eo);
#endif
- pictfmt = XRenderFindVisualFormat(dpy, w->a.visual);
- pa.subwindow_mode = IncludeInferiors;
- w->picture = XRenderCreatePicture(dpy, draw,
- pictfmt, CPSubwindowMode, &pa);
- }
D2printf("paint %#lx %d %#lx\n", eo->win, w->mode, w->picture);
#if 0 /* FIXME - Why? */
@@ -1512,7 +1558,6 @@
{
if (w->borderSize)
{
- set_ignore(dpy, NextRequest(dpy));
XFixesDestroyRegion(dpy, w->borderSize);
w->borderSize = None;
}
@@ -1545,9 +1590,7 @@
if (w->mode == WINDOW_SOLID)
{
XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, region);
- set_ignore(dpy, NextRequest(dpy));
XFixesSubtractRegion(dpy, region, region, w->borderSize);
- set_ignore(dpy, NextRequest(dpy));
XRenderComposite(dpy, PictOpSrc, w->picture, None, rootBuffer,
0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
}
@@ -1567,7 +1610,6 @@
case CompSimple:
break;
case CompServerShadows:
- set_ignore(dpy, NextRequest(dpy));
if (w->opacity != OPAQUE && !w->shadowPict)
w->shadowPict = EPictureCreateSolid(True,
(double)w->opacity /
@@ -1596,38 +1638,33 @@
case WINDOW_SOLID:
#if 0
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, region);
- set_ignore(dpy, NextRequest(dpy));
XFixesSubtractRegion(dpy, region, region, w->borderSize);
#endif
- set_ignore(dpy, NextRequest(dpy));
XRenderComposite(dpy, PictOpSrc, w->picture, None, pbuf,
0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
case WINDOW_TRANS:
ECompMgrCheckAlphaMask(w);
- set_ignore(dpy, NextRequest(dpy));
- XRenderComposite(dpy, PictOpOver, w->picture, w->alphaPict,
- pbuf, 0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
+ XRenderComposite(dpy, PictOpOver, w->picture, w->alphaPict, pbuf,
+ 0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
break;
case WINDOW_ARGB:
ECompMgrCheckAlphaMask(w);
- set_ignore(dpy, NextRequest(dpy));
- XRenderComposite(dpy, PictOpOver, w->picture, w->alphaPict,
- pbuf, 0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
- break;
+ XRenderComposite(dpy, PictOpOver, w->picture, w->alphaPict, pbuf,
+ 0, 0, 0, 0, w->rcx, w->rcy, w->rcw, w->rch);
break;
}
XFixesDestroyRegion(dpy, w->borderClip);
w->borderClip = None;
}
- XFixesDestroyRegion(dpy, region);
-
if (pbuf != rootPicture)
{
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, None);
XRenderComposite(dpy, PictOpSrc, pbuf, None, rootPicture,
0, 0, 0, 0, 0, 0, VRoot.w, VRoot.h);
}
+
+ XFixesDestroyRegion(dpy, region);
}
static void
@@ -1748,8 +1785,6 @@
allDamage = None;
clipChanged = True;
- XGrabServer(disp);
-
switch (Conf_compmgr.mode)
{
case ECOMPMGR_MODE_AUTO:
@@ -1767,25 +1802,6 @@
break;
}
-#if 0
- /* Build initial list of children */
- if (Conf_compmgr.mode != ECOMPMGR_MODE_AUTO)
- {
- Window root_return, parent_return;
- Window *children;
- unsigned int nchildren;
- unsigned int i;
-
- XQueryTree(disp, VRoot.win, &root_return, &parent_return, &children,
- &nchildren);
- for (i = 0; i < nchildren; i++)
- ECompMgrWinNew(children[i], i ? children[i - 1] : None);
- XFree(children);
- }
-#endif
-
- XUngrabServer(disp);
-
if (Conf_compmgr.mode != ECOMPMGR_MODE_AUTO)
ECompMgrRepaint(disp, ERegionCreate(0, 0, VRoot.w, VRoot.h));
}
@@ -1810,12 +1826,12 @@
DeskBackgroundPictureFree(0);
- lst = EobjListStackGetForDesk(&num, 0 /*desk */ );
+ lst = EobjListStackGet(&num);
for (i = 0; i < num; i++)
ECompMgrWinDel(lst[i], False, False);
- XCompositeRedirectSubwindows(disp, VRoot.win, CompositeRedirectAutomatic);
+ XCompositeUnredirectSubwindows(disp, VRoot.win, CompositeRedirectManual);
}
static void
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs