Merge lp:~unity-team/unity/show-menu-later into lp:unity

[Neil J. Patel]

Due to timing issues on slower systems, the current way of relying on one XFlush to make sure X honors our ungrab pointer request isn't good enough. This update pushes the calling of the dbus method to the end of the main iteration, and gives us a chance to XFlush twice, which works on those systems (tested on two affected systems: netbook (njpatel) and desktop (didrocks)).

Main thing to test here is that it hasn't broken opening menus for you. There are no tests because we can't test something like this right now.

[Jason Smith (jassmith)]

+1, works here

review: Approve

=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2010-11-17 20:12:42 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2010-11-25 13:10:03 +0000
@@ -33,8 +33,17 @@
 #define S_PATH  "/com/canonical/Unity/Panel/Service"
 #define S_IFACE "com.canonical.Unity.Panel.Service"
 
-
-// Enums
+typedef struct
+{
+  GDBusProxy *proxy;
+  gchar *entry_id;
+  int x;
+  int y;
+  guint timestamp;
+  guint32 button;
+
+} ShowEntryData;
+
 
 // Forwards
 static void on_proxy_ready_cb (GObject      *source,
@@ -125,6 +134,35 @@
                      this);
 }
 
+static gboolean
+send_show_entry (ShowEntryData *data)
+{
+  g_return_val_if_fail (data != NULL, FALSE);
+  g_return_val_if_fail (G_IS_DBUS_PROXY (data->proxy), FALSE);
+  
+  /* Re-flush 'cos X is crap like that */
+  Display* d = nux::GetThreadGLWindow()->GetX11Display();
+  XFlush (d);
+  
+  g_dbus_proxy_call (data->proxy,
+                     "ShowEntry",
+                     g_variant_new ("(suiii)",
+                                    data->entry_id,
+                                    0,
+                                    data->x,
+                                    data->y,
+                                    data->button),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1,
+                     NULL,
+                     NULL,
+                     NULL);
+
+  g_free (data->entry_id);
+  g_slice_free (ShowEntryData, data);
+  return FALSE;
+}
+
 void
 IndicatorObjectFactoryRemote::OnShowMenuRequestReceived (const char *entry_id,
                                                          int         x,
@@ -136,19 +174,18 @@
   XUngrabPointer(d, CurrentTime);
   XFlush (d);
 
-  g_dbus_proxy_call (_proxy,
-                     "ShowEntry",
-                     g_variant_new ("(suiii)",
-                                    entry_id,
-                                    0,
-                                    x,
-                                    y,
-                                    button),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1,
-                     NULL,
-                     NULL,
-                     NULL);
+  // We have to do this because on certain systems X won't have time to 
+  // respond to our request for XUngrabPointer and this will cause the
+  // menu not to show
+  ShowEntryData *data = g_slice_new0 (ShowEntryData);
+  data->proxy = _proxy;
+  data->entry_id = g_strdup (entry_id);
+  data->x = x;
+  data->y = y;
+  data->timestamp = timestamp;
+  data->button = button;
+
+  g_timeout_add (0, (GSourceFunc)send_show_entry, data);
 
   // --------------------------------------------------------------------------
   // FIXME: This is a workaround until the non-paired events issue is fixed in