Merge lp:~mterry/unity-greeter/fix-focus into lp:unity-greeter

[Michael Terry]

There are two problems currently with the focus-on-map logic:

1) The signature of the function was wrong, so vala was expecting the *this* pointer as the first argument, when it should have been expecting an XEvent pointer. This made our check for what type of event it was incorrect.

2) We shouldn't try to see if the window has requested not to be focused on map. For some reason, the shutdown dialog does that (though in my Unity session, compiz does focus it on map). This must be one of those vagaries of window managers. It doesn't hurt to focus everything as it comes by.

[Robert Ancell (robert-ancell)]

Can you check this works with onboard? That code was changed so onboard didn't get focus:
http://bazaar.launchpad.net/~unity-greeter-team/unity-greeter/trunk/revision/363.1.1

[lp:~mterry/unity-greeter/fix-focus]

432. By Michael Terry on 2012-05-30

Make sure to not focus our onscreen keyboard

[Michael Terry (mterry)]

Fixed now. Please review again.

I found that we couldn't seem to rely on the types and flags of foreign GdkWindows, but since we do keep track of the xid of the onboard window we create, I used that to detect whether the new window was the onboard one.

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-04-16 08:33:55 +0000
+++ src/main-window.vala	2012-05-30 15:45:26 +0000
@@ -21,10 +21,10 @@
 public class MainWindow : Gtk.Window
 {
     public UserList user_list;
+    public MenuBar menubar;
 
     private List<Monitor> monitors;
     private Background background;
-    private MenuBar menubar;
     private Gtk.Box login_box;
 
     private uint change_background_timeout = 0;
 
=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-03-21 20:00:39 +0000
+++ src/menubar.vala	2012-05-30 15:45:26 +0000
@@ -67,6 +67,7 @@
 {
     public Background? background {get; construct; default = null;}
     public bool high_contrast {get; private set; default = false;}
+    public Gtk.Window? keyboard_window {get; private set; default = null;}
 
     public Gtk.AccelGroup? accel_group {get; construct;}
 
@@ -121,7 +122,6 @@
     private Gtk.CheckMenuItem high_contrast_item;
     private Gtk.Label keyboard_label = null;
     private Pid keyboard_pid = 0;
-    private Gtk.Window? keyboard_window = null;
 
     construct
     {
 
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-05-29 16:40:24 +0000
+++ src/unity-greeter.vala	2012-05-30 15:45:26 +0000
@@ -43,7 +43,7 @@
 
     private SettingsDaemon settings_daemon;
 
-    private MainWindow main_window;
+    private static MainWindow main_window;
     public UserList user_list;
 
     private LightDM.Greeter greeter;
@@ -686,17 +686,23 @@
         }
     }
 
-    private Gdk.FilterReturn focus_upon_map (X.Event xevent, Gdk.Event event)
+    private static Gdk.FilterReturn focus_upon_map (Gdk.XEvent gxevent, Gdk.Event event)
     {
+        var xevent = (X.Event*)gxevent;
         if (xevent.type == X.EventType.MapNotify)
         {
             var display = Gdk.Display.get_default ();
-            var win = Gdk.X11Window.foreign_new_for_display (display, xevent.xmap.window);
-
-            if (win.get_accept_focus ())
+            var xwin = xevent.xmap.window;
+            var win = Gdk.X11Window.foreign_new_for_display (display, xwin);
+
+            // Check to see if this window is our onboard window, since we
+            // don't want to focus it.
+            X.Window keyboard_xid = 0;
+            if (main_window.menubar.keyboard_window != null)
+                keyboard_xid = Gdk.X11Window.get_xid (main_window.menubar.keyboard_window.get_window ());
+
+            if (xwin != keyboard_xid)
                 win.focus (Gdk.CURRENT_TIME);
-            else
-                user_list.focus_prompt ();
         }
         return Gdk.FilterReturn.CONTINUE;
     }
@@ -709,7 +715,7 @@
            continuing even if not actually marked as modal) */
         var root = Gdk.get_default_root_window ();
         root.set_events (root.get_events () | Gdk.EventMask.SUBSTRUCTURE_MASK);
-        root.add_filter ((Gdk.FilterFunc) focus_upon_map);
+        root.add_filter (focus_upon_map);
     }
 
     private static Cairo.XlibSurface? create_root_surface (Gdk.Screen screen)