Changeset 4b0895a574f8fbaaf2caa4a11fc9c6b4fe504c09

Timestamp:

03/19/09 15:30:45 (3 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

014842639ffec88ea516166f1a40e612591a1d63

Parents:

c87d938e304a9095234a1e40819b25d5fd433bef

git-author:

Aleksandar Krsteski <alekrsteski@…> (03/18/09 21:03:28)

git-committer:

Lincoln de Sousa <lincoln@…> (03/19/09 15:30:45)

Message:

Try a better fix for losefocus race condition.

Try to fix the race condition between window losefocus event and
keybinding event from globalhotkeys in a better way, by comparing event
times of the keybinding event and losefocus event. To achive this add a
python binding for keybinder_get_current_event_time funcion and use it
to compare keybinding timestamp with losefocus timestamp.

Location:

src

Files:

• globalhotkeys/globalhotkeys.c (modified) (2 diffs)
• guake.py (modified) (3 diffs)

src/globalhotkeys/globalhotkeys.c

@@ -197 +197 @@
 }
 
+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,
@@ -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

@@ -523 +523 @@
         self.fullscreen = False
 
+        # holds the timestamp of the losefocus event
+        self.losefocus_time = 0
+
         # double click stuff
         def double_click(hbox, event):
@@ -605 +608 @@
         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):
@@ -670 +663 @@
         """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()