[Xfce4-commits] r26889 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2008-04-23 21:24:33 +0000 (Wed, 23 Apr 2008)
New Revision: 26889

Modified:
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/client.h
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/screen.c
Log:
Let see if changing the grab improves things

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2008-04-22 20:43:07 UTC (rev 26888)
+++ xfwm4/trunk/src/client.c	2008-04-23 21:24:33 UTC (rev 26889)
@@ -5111,7 +5111,7 @@
 }
 
 void
-clientCycle (Client * c, XEvent * ev)
+clientCycle (Client * c, XKeyEvent * ev)
 {
     ScreenInfo *screen_info;
     DisplayInfo *display_info;
@@ -5124,8 +5124,8 @@
     screen_info = c->screen_info;
     display_info = screen_info->display_info;
 
-    g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-    g2 = myScreenGrabPointer (screen_info, NoEventMask,  None, myDisplayGetCurrentTime (display_info));
+    g1 = myScreenGrabKeyboard (screen_info, ev->time);
+    g2 = myScreenGrabPointer (screen_info, NoEventMask,  None, ev->time);
 
     if (!g1 || !g2)
     {

Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h	2008-04-22 20:43:07 UTC (rev 26888)
+++ xfwm4/trunk/src/client.h	2008-04-23 21:24:33 UTC (rev 26889)
@@ -403,7 +403,7 @@
                                                                  int,
                                                                  XEvent *);
 void                     clientCycle                            (Client *,
-                                                                 XEvent *);
+                                                                 XKeyEvent *);
 void                     clientButtonPress                      (Client *,
                                                                  Window,
                                                                  XButtonEvent *);

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2008-04-22 20:43:07 UTC (rev 26888)
+++ xfwm4/trunk/src/events.c	2008-04-23 21:24:33 UTC (rev 26889)
@@ -377,7 +377,7 @@
                 }
                 break;
             case KEY_CYCLE_WINDOWS:
-                clientCycle (c, (XEvent *) ev);
+                clientCycle (c, ev);
                 break;
             case KEY_CLOSE_WINDOW:
                 clientClose (c);

Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c	2008-04-22 20:43:07 UTC (rev 26888)
+++ xfwm4/trunk/src/screen.c	2008-04-23 21:24:33 UTC (rev 26889)
@@ -399,7 +399,7 @@
     {
         grab = (XGrabKeyboard (myScreenGetXDisplay (screen_info),
                                screen_info->xfwm4_win,
-                               FALSE,
+                               TRUE,
                                GrabModeAsync, GrabModeAsync,
                                time) == GrabSuccess);
     }
@@ -422,7 +422,7 @@
     {
         grab = (XGrabPointer (myScreenGetXDisplay (screen_info),
                               screen_info->xfwm4_win,
-                              FALSE, event_mask,
+                              TRUE, event_mask,
                               GrabModeAsync, GrabModeAsync,
                               screen_info->xroot,
                               cursor,