From 03efa3ccbc39499be49d87ee10ac917db4d2233f Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 30 Apr 2014 09:30:35 -0400
Subject: [PATCH] keybindings: Make sure to unfreeze the keyboard on the right
 xdisplay

This fixes keybindings getting "stuck" after being activated in
X11 compositor mode.
---
 src/core/keybindings.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index f0b6122a1..515f71d25 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1767,9 +1767,16 @@ meta_display_process_key_event (MetaDisplay     *display,
         return TRUE;
     }
 
-  XIAllowEvents (display->xdisplay,
-                 clutter_input_device_get_device_id (event->device),
-                 XIAsyncDevice, event->time);
+  {
+    MetaBackend *backend = meta_get_backend ();
+    if (META_IS_BACKEND_X11 (backend))
+      {
+        Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+        XIAllowEvents (xdisplay,
+                       clutter_input_device_get_device_id (event->device),
+                       XIAsyncDevice, event->time);
+      }
+  }
 
   keep_grab = TRUE;
   if (all_keys_grabbed)