Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ewins.c
Log Message:
Avoid setting shape to default (unshaped) on ShapeNotify when already set.
This fixes an event looping problem on Xsun where doing so generates
Shape (and Visibility) Notify events (Xsun bug?).
- Thanks again to Mark Bowyer for help to track this down.
Additional shape debug stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- ewins.c 7 Jan 2006 15:02:15 -0000 1.138
+++ ewins.c 12 Jan 2006 22:50:09 -0000 1.139
@@ -615,10 +615,10 @@
EShapeCopy(ewin->win_container, _EwinGetClientWin(ewin));
EUngrabServer();
-#if 0 /* Debug */
- Eprintf("EwinUpdateShapeInfo %#lx cont=%#lx shaped=%d\n",
- _EwinGetClientXwin(ewin), ewin->win_container, ewin->client.shaped);
-#endif
+ if (EventDebug(EX_EVENT_SHAPE_NOTIFY))
+ Eprintf("EwinUpdateShapeInfo %#lx cont=%#lx shaped=%d\n",
+ _EwinGetClientXwin(ewin), _EwinGetContainerXwin(ewin),
+ ewin->state.shaped);
}
void
@@ -630,16 +630,16 @@
if (ewin->state.docked)
return;
-#if 0
- Eprintf("EwinPropagateShapes %#lx %#lx %s\n", EoGetWin(ewin),
- _EwinGetClientXwin(ewin), EoGetName(ewin));
-#endif
- if (ewin->update.shape)
- {
- EShapePropagate(EoGetWin(ewin));
- EoChangeShape(ewin);
- ewin->update.shape = 0;
- }
+ if (!ewin->update.shape)
+ return;
+
+ if (EventDebug(EX_EVENT_SHAPE_NOTIFY))
+ Eprintf("EwinPropagateShapes %#lx frame=%#lx shaped=%d\n",
+ _EwinGetClientXwin(ewin), EoGetWin(ewin), ewin->state.shaped);
+
+ EShapePropagate(EoGetWin(ewin));
+ EoChangeShape(ewin);
+ ewin->update.shape = 0;
}
void
@@ -1298,11 +1298,19 @@
}
static void
-EwinEventShapeChange(EWin * ewin)
+EwinEventShapeChange(EWin * ewin, XEvent * ev)
{
+#define se ((XShapeEvent *)ev)
+ if (EventDebug(EX_EVENT_SHAPE_NOTIFY))
+ Eprintf("EwinEventShapeChange %#lx %s: state.shaped=%d ev->shaped=%d\n",
+ _EwinGetClientXwin(ewin), EoGetName(ewin), ewin->state.shaped,
+ se->shaped);
+ if (!se->shaped && !ewin->state.shaped)
+ return;
EwinUpdateShapeInfo(ewin);
ewin->update.shape = 1;
EwinPropagateShapes(ewin);
+#undef se
}
static void
@@ -1933,7 +1941,7 @@
break;
case EX_EVENT_SHAPE_NOTIFY:
- EwinEventShapeChange(ewin);
+ EwinEventShapeChange(ewin, ev);
break;
default:
-------------------------------------------------------
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
