Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
aclass.c desktops.c events.c setup.c
Log Message:
Fix keygrabs handling (e.g. focus list staying up).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/aclass.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- aclass.c 19 Mar 2005 16:39:57 -0000 1.12
+++ aclass.c 25 Mar 2005 18:11:52 -0000 1.13
@@ -1389,7 +1389,7 @@
{
mod = AnyModifier;
XGrabKey(disp, aa->key, mod, VRoot.win, False, GrabModeAsync,
- GrabModeAsync);
+ GrabModeSync);
}
else
{
@@ -1398,7 +1398,7 @@
/* grab the key even if locks are on or not */
for (i = 0; i < 8; i++)
XGrabKey(disp, aa->key, mod | Mode.masks.mod_combos[i], VRoot.win,
- False, GrabModeAsync, GrabModeAsync);
+ False, GrabModeAsync, GrabModeSync);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- desktops.c 21 Mar 2005 19:02:43 -0000 1.133
+++ desktops.c 25 Mar 2005 18:11:52 -0000 1.134
@@ -25,7 +25,7 @@
#include <time.h>
#define EDESK_EVENT_MASK \
- (KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | \
+ (ButtonPressMask | ButtonReleaseMask | \
EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | \
SubstructureNotifyMask | SubstructureRedirectMask | PropertyChangeMask)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- events.c 19 Mar 2005 16:40:01 -0000 1.80
+++ events.c 25 Mar 2005 18:11:53 -0000 1.81
@@ -236,6 +236,8 @@
case KeyPress: /* 2 */
case KeyRelease: /* 3 */
ModeGetXY(ev->xbutton.root, ev->xkey.x_root, ev->xkey.y_root);
+ /* Unfreeze keyboard in case we got here by keygrab */
+ XAllowEvents(disp, AsyncKeyboard, CurrentTime);
break;
case ButtonPress: /* 4 */
SoundPlay("SOUND_BUTTON_CLICK");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- setup.c 19 Mar 2005 16:40:16 -0000 1.155
+++ setup.c 25 Mar 2005 18:11:53 -0000 1.156
@@ -284,8 +284,7 @@
mask =
ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
ButtonMotionMask | PropertyChangeMask | SubstructureRedirectMask |
- KeyPressMask | KeyReleaseMask | PointerMotionMask |
- SubstructureNotifyMask;
+ PointerMotionMask | SubstructureNotifyMask;
if (Mode.wm.window)
mask |= StructureNotifyMask;
XSelectInput(disp, VRoot.win, mask);
-------------------------------------------------------
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://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
