Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
desktops.c events.c moveresize.c x.c
Log Message:
Forget destroyed windows properly, fix placement.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95.2.29
retrieving revision 1.95.2.30
diff -u -3 -r1.95.2.29 -r1.95.2.30
--- desktops.c 21 Nov 2004 22:15:20 -0000 1.95.2.29
+++ desktops.c 26 Nov 2004 16:42:58 -0000 1.95.2.30
@@ -1401,6 +1401,10 @@
XUngrabPointer(disp, CurrentTime);
+ /* Don't handle desk bindings while doing stuff */
+ if (Mode.mode)
+ return;
+
ac = FindItem("DESKBINDINGS", 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
if (ac)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.69.2.19
retrieving revision 1.69.2.20
diff -u -3 -r1.69.2.19 -r1.69.2.20
--- events.c 23 Nov 2004 23:46:25 -0000 1.69.2.19
+++ events.c 26 Nov 2004 16:42:58 -0000 1.69.2.20
@@ -328,6 +328,12 @@
Mode.last_bpress = 0;
Mode.action_inhibit = 0;
break;
+
+#if 1 /* Do this here? */
+ case DestroyNotify:
+ EUnregisterWindow(disp, ev->xdestroywindow.window);
+ break;
+#endif
}
EDBUG_RETURN_;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.22.2.13
retrieving revision 1.22.2.14
diff -u -3 -r1.22.2.13 -r1.22.2.14
--- moveresize.c 20 Nov 2004 20:48:58 -0000 1.22.2.13
+++ moveresize.c 26 Nov 2004 16:42:58 -0000 1.22.2.14
@@ -98,11 +98,11 @@
EDBUG(6, "doMoveEnd");
- GrabPointerRelease();
-
if (ewin && ewin != mode_moveresize_ewin)
return 0;
+ GrabPointerRelease();
+
SoundPlay("SOUND_MOVE_STOP");
ewin = mode_moveresize_ewin;
@@ -167,6 +167,7 @@
Mode.nogroup = 0;
Mode.move.swap = 0;
Mode.have_place_grab = 0;
+ Mode.place = 0;
ModulesSignal(ESIGNAL_MOVE_DONE, NULL);
@@ -361,11 +362,11 @@
EDBUG(0, "doResizeEnd");
- GrabPointerRelease();
-
if (ewin && ewin != mode_moveresize_ewin)
return 0;
+ GrabPointerRelease();
+
SoundPlay("SOUND_RESIZE_STOP");
ewin = mode_moveresize_ewin;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.71.2.13
retrieving revision 1.71.2.14
diff -u -3 -r1.71.2.13 -r1.71.2.14
--- x.c 23 Nov 2004 23:46:44 -0000 1.71.2.13
+++ x.c 26 Nov 2004 16:42:58 -0000 1.71.2.14
@@ -72,8 +72,7 @@
if (xid->rects)
XFree(xid->rects);
#if 0
- if (xid->cbl.lst)
- Eprintf("EXidDestroy: %p %#lx\n", xid, xid->win);
+ Eprintf("EXidDestroy: %p %#lx\n", xid, xid->win);
#endif
if (xid->cbl.lst)
Efree(xid->cbl.lst);
@@ -102,6 +101,9 @@
if (!xid)
return;
+#if 0
+ Eprintf("EXidDelete: %p %#lx\n", xid, xid->win);
+#endif
XDeleteContext(disp, win, xid_context);
if (xid->in_use)
xid->do_del = 1;
-------------------------------------------------------
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
