Merge lp:~saviq/unity-2d/fix-launcher-timestamp into lp:unity-2d

[Michał Sawicz]

[launcher] Fix interaction with the window manager

When launching a new application, we need to forward a proper timestamp from the X server so that the window manager can successfully do focus stealing prevention.

[lp:~saviq/unity-2d/fix-launcher-timestamp]

718. By Michał Sawicz on 2011-09-14

Tweak the comments.

[Michał Sawicz (saviq)]

[launcher] Fix interaction with the window manager

When launching a new application, we need to forward a proper timestamp from the X server so that the window manager can successfully do focus stealing prevention.

=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
--- libunity-2d-private/src/launcherapplication.cpp	2011-08-18 09:40:57 +0000
+++ libunity-2d-private/src/launcherapplication.cpp	2011-09-14 08:52:26 +0000
@@ -56,6 +56,7 @@
 
 extern "C" {
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <libsn/sn.h>
 }
 
@@ -656,14 +657,22 @@
     }
 
     GError* error = NULL;
-    GTimeVal timeval;
-
-    g_get_current_time (&timeval);
+
+    GdkWindow* root;
+    guint32 timestamp;
+
     GdkDisplay* display = gdk_display_get_default();
     GObjectScopedPointer<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
-    /* Using GDK_CURRENT_TIME doesn’t seem to work, launched windows
-       sometimes don’t get focus (see https://launchpad.net/bugs/643616). */
-    gdk_app_launch_context_set_timestamp(context.data(), timeval.tv_sec);
+
+    /* We need to take the timestamp from the X server for the
+       window manager to work properly
+       https://bugs.launchpad.net/unity-2d/+bug/735205 */
+    /* FIXME: ultimately we should forward the timestamps from
+       events that triggered the launch */
+    root = gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW());
+    timestamp = gdk_x11_get_server_time(root);
+
+    gdk_app_launch_context_set_timestamp(context.data(), timestamp);
 
     g_app_info_launch(m_appInfo.data(), NULL, (GAppLaunchContext*)context.data(), &error);