Ticket #95: 0002-Try-a-better-fix-for-losefocus-race-condition.patch

src/globalhotkeys/globalhotkeys.c

@@ -196 +196 @@
   return NULL;
 }
 
+static PyObject *
+GlobalHotkey_get_current_event_time (GlobalHotkey *self)
+{
+  guint32 ret = keybinder_get_current_event_time ();
+  return Py_BuildValue ("i", ret);
+}
+
 static struct PyMemberDef GlobalHotkey_members[] = {
   {"binded", T_OBJECT_EX, offsetof (GlobalHotkey, binded), 0,
    "Already binded hotkeys"},
@@ -216 +223 @@
   {"bind", (PyCFunction) GlobalHotkey_bind,
    METH_VARARGS, "Bind a key to a callable object"},
 
+  {"get_current_event_time", (PyCFunction) GlobalHotkey_get_current_event_time,
+   METH_NOARGS, "Returns the timestamp of the current event"},
+
   {NULL}                        /* sentinel */
 };
 

src/guake.py

@@ -524 +524 @@
         # holds fullscreen status
         self.fullscreen = False
 
+        # holds the timestamp of the losefocus event
+        self.losefocus_time = 0
+
         # double click stuff
         def double_click(hbox, event):
             """Handles double clicks on tabs area and when receive
@@ -606 +609 @@
         value = self.client.get_bool(KEY('/general/window_losefocus'))
         visible = window.get_property('visible')
         if value and visible and not self.showing_context_menu:
+            self.losefocus_time = gtk.gdk.x11_get_server_time(self.window.window)
             self.hide()
 
-            # There is a race condition between the focus-out-event and
-            # the global keybind that calls the self.show_hide method. I
-            # didn't investigate but this callback is allways called
-            # before the X keyboard event. So, to fix it temporarely, I
-            # did the following hammer:
-            def hack():
-                sleep(0.1)
-                self.client.notify(GKEY('show_hide'))
-            self.hotkeys.unbind_all()
-            start_new_thread(hack, ())
-
     def show_menu(self, *args):
         """Show the tray icon menu.
         """
@@ -671 +664 @@
     def show_hide(self, *args):
         """Toggles the main window visibility
         """
+        event_time = self.hotkeys.get_current_event_time()
+
+        if self.losefocus_time and \
+                self.losefocus_time >= event_time and \
+                (self.losefocus_time - event_time) < 10:
+            self.losefocus_time = 0
+            return
+
         if not self.window.get_property('visible'):
             self.show()
             self.set_terminal_focus()