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

[Olivier Fourdan]

Author: olivier
Date: 2006-10-09 19:55:18 +0000 (Mon, 09 Oct 2006)
New Revision: 23329

Modified:
   xfwm4/trunk/src/events.c
Log:
Fix deadlock with previous commit.

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2006-10-09 19:36:10 UTC (rev 23328)
+++ xfwm4/trunk/src/events.c	2006-10-09 19:55:18 UTC (rev 23329)
@@ -369,11 +369,13 @@
 {
     ScreenInfo *screen_info;
     Client *c;
+    gboolean allow_events;
     int key;
 
     TRACE ("entering handleKeyEvent");
 
     c = clientGetFocus ();
+    allow_events = FALSE;
     if (c)
     {
         screen_info = c->screen_info;
@@ -473,7 +475,15 @@
                 }
                 break;
             case KEY_POPUP_MENU:
+                /* 
+                   We need to release the events here prior to grabbing 
+                   the keyboard in gtk menu otherwise we end with a dead lock...
+                  */
+                XAllowEvents (display_info->dpy, AsyncKeyboard, CurrentTime);
                 show_window_menu (c, frameX(c), frameY(c), 1, GDK_CURRENT_TIME);
+                /* 'nuff for now */
+                return;
+
                 break;
             default:
                 break;