From 199395a39523d08b0beb915bc67901a690e64d69 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 13 Jun 2011 12:33:15 +0200
Subject: [PATCH] Replace XAllowEvents with meta_device_allow_events()

---
 src/core/display.c     |  8 +++++---
 src/core/keybindings.c | 16 ++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index 6345d8d18..604eb9c89 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1740,6 +1740,7 @@ event_callback (XEvent   *event,
       Time evtime = meta_input_event_get_time (display, event);
       guint n_button, state, mode, detail;
       gdouble ev_root_x, ev_root_y;
+      MetaDevice *device;
 
       if (window && !window->override_redirect &&
           ((evtype == KeyPress) || (evtype == ButtonPress)))
@@ -1761,6 +1762,8 @@ event_callback (XEvent   *event,
             }
         }
 
+      device = meta_input_event_get_device (display, event);
+
       switch (evtype)
         {
         case KeyPress:
@@ -1959,8 +1962,7 @@ event_callback (XEvent   *event,
                                 mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
                                 (unsigned int) evtime);
 
-                  XAllowEvents (display->xdisplay,
-                            mode, evtime);
+                  meta_device_allow_events (device, mode, evtime);
                 }
 
               if (begin_move && window->has_move_func)
@@ -3891,7 +3893,7 @@ meta_change_button_grab (MetaDisplay *display,
       if (meta_is_debugging ())
         meta_error_trap_push_with_return (display);
 
-      /* GrabModeSync means freeze until XAllowEvents */
+      /* GrabModeSync means freeze until X(I)AllowEvents */
       
       if (grab)
         XGrabButton (display->xdisplay, button, modmask | ignored_mask,
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 5a5e330fb..e0776a71e 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1369,6 +1369,7 @@ process_overlay_key (MetaDisplay *display,
                      KeySym keysym)
 {
   guint evtype, keycode;
+  MetaDevice *keyboard;
   Time evtime;
 
   if (!meta_input_event_get_type (display, event, &evtype) ||
@@ -1376,6 +1377,7 @@ process_overlay_key (MetaDisplay *display,
     return FALSE;
 
   evtime = meta_input_event_get_time (display, event);
+  keyboard = meta_input_event_get_device (display, event);
 
   if (display->overlay_key_only_pressed)
     {
@@ -1404,13 +1406,13 @@ process_overlay_key (MetaDisplay *display,
                * binding, we unfreeze the keyboard but keep the grab
                * (this is important for something like cycling
                * windows */
-              XAllowEvents (display->xdisplay, AsyncKeyboard, evtime);
+              meta_device_allow_events (keyboard, AsyncKeyboard, evtime);
             }
           else
             {
               /* Replay the event so it gets delivered to our
                * per-window key bindings or to the application */
-              XAllowEvents (display->xdisplay, ReplayKeyboard, evtime);
+              meta_device_allow_events (keyboard, ReplayKeyboard, evtime);
             }
         }
       else if (evtype == KeyRelease)
@@ -1418,7 +1420,7 @@ process_overlay_key (MetaDisplay *display,
           display->overlay_key_only_pressed = FALSE;
           /* We want to unfreeze events, but keep the grab so that if the user
            * starts typing into the overlay we get all the keys */
-          XAllowEvents (display->xdisplay, AsyncKeyboard, evtime);
+          meta_device_allow_events (keyboard, AsyncKeyboard, evtime);
           meta_display_overlay_key_activate (display);
         }
 
@@ -1430,7 +1432,7 @@ process_overlay_key (MetaDisplay *display,
       display->overlay_key_only_pressed = TRUE;
       /* We keep the keyboard frozen - this allows us to use ReplayKeyboard
        * on the next event if it's not the release of the overlay key */
-      XAllowEvents (display->xdisplay, SyncKeyboard, evtime);
+      meta_device_allow_events (keyboard, SyncKeyboard, evtime);
 
       return TRUE;
     }
@@ -1464,6 +1466,7 @@ meta_display_process_key_event (MetaDisplay *display,
   const char *str;
   MetaScreen *screen;
   guint evtype, keycode, state;
+  MetaDevice *keyboard;
   Window xwindow;
   Time evtime;
 
@@ -1473,6 +1476,7 @@ meta_display_process_key_event (MetaDisplay *display,
     return FALSE;
 
   evtime = meta_input_event_get_time (display, event);
+  keyboard = meta_input_event_get_device (display, event);
 
   if (all_bindings_disabled)
     {
@@ -1484,7 +1488,7 @@ meta_display_process_key_event (MetaDisplay *display,
        * poorly defined how this mode is supposed to interact with
        * plugins.
        */
-      XAllowEvents (display->xdisplay, ReplayKeyboard, evtime);
+      meta_device_allow_events (keyboard, ReplayKeyboard, evtime);
       return FALSE;
     }
 
@@ -1525,7 +1529,7 @@ meta_display_process_key_event (MetaDisplay *display,
         return TRUE;
     }
 
-  XAllowEvents (display->xdisplay, AsyncKeyboard, evtime);
+  meta_device_allow_events (keyboard, AsyncKeyboard, evtime);
 
   keep_grab = TRUE;
   if (all_keys_grabbed)