Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c ewins.c icccm.c
Log Message:
Set ICCCM configure position relative to desk origin.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- desktops.c 16 Oct 2005 13:59:52 -0000 1.188
+++ desktops.c 18 Oct 2005 18:00:53 -0000 1.189
@@ -919,7 +919,6 @@
{
Desk *dd;
unsigned int i;
- EWin *const *lst;
int n, v, dx, dy;
if (dsk->num <= 0)
@@ -978,10 +977,14 @@
if (dsk->tag)
ButtonMoveRelative(dsk->tag, dx, dy);
+#if 0 /* FIXME - Remove? */
+ EWin *const *lst;
+
lst = EwinListGetAll(&n);
for (i = 0; i < (unsigned int)n; i++)
if (EoGetDesk(lst[i]) == dsk)
ICCCM_Configure(lst[i]);
+#endif
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- ewins.c 16 Oct 2005 09:33:49 -0000 1.112
+++ ewins.c 18 Oct 2005 18:00:53 -0000 1.113
@@ -1104,10 +1104,19 @@
w = ewin->client.w;
h = ewin->client.h;
winrel = 0;
+ /* This is shady - some clients send root coords, some use the
+ * ICCCM ones sent by us */
+#if 1 /* FIXME - ??? */
if (ev->xconfigurerequest.value_mask & CWX)
x = ev->xconfigurerequest.x;
if (ev->xconfigurerequest.value_mask & CWY)
y = ev->xconfigurerequest.y;
+#else
+ if (ev->xconfigurerequest.value_mask & CWX)
+ x = ev->xconfigurerequest.x - EoGetX(EoGetDesk(ewin));
+ if (ev->xconfigurerequest.value_mask & CWY)
+ y = ev->xconfigurerequest.y - EoGetY(EoGetDesk(ewin));
+#endif
if (ev->xconfigurerequest.value_mask & CWWidth)
w = ev->xconfigurerequest.width;
if (ev->xconfigurerequest.value_mask & CWHeight)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- icccm.c 12 Oct 2005 17:20:42 -0000 1.111
+++ icccm.c 18 Oct 2005 18:00:53 -0000 1.112
@@ -259,7 +259,6 @@
ICCCM_Configure(const EWin * ewin)
{
XEvent ev;
- Desk *dsk;
Window child;
if (EwinIsInternal(ewin))
@@ -269,9 +268,16 @@
ev.xconfigure.display = disp;
ev.xconfigure.event = _EwinGetClientXwin(ewin);
ev.xconfigure.window = _EwinGetClientXwin(ewin);
+#if 0 /* FIXME - Remove? */
+ Desk *dsk;
+
dsk = EoGetDesk(ewin);
ev.xconfigure.x = EoGetX(dsk) + ewin->client.x;
ev.xconfigure.y = EoGetY(dsk) + ewin->client.y;
+#else
+ ev.xconfigure.x = ewin->client.x;
+ ev.xconfigure.y = ewin->client.y;
+#endif
if (Mode.wm.window)
XTranslateCoordinates(disp, VRoot.win, RRoot.win,
ev.xconfigure.x, ev.xconfigure.y,
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
