Merge lp:~mterry/unity-greeter/keyboard-indicator into lp:unity-greeter

[Michael Terry]

Adds a keyboard indicator. Requires a fix to lightdm first: https://code.launchpad.net/~mterry/lightdm/fix-get-layout/+merge/86427

[Haggai Eran (haggai-eran)]

Hi,

I think this works nicely, for switching layout in the greeter.(I've tried it without updating lightdm, so I'm not sure if it was supposed to work, but it did.) But I think there are two issues with this patch:
First, I'm not sure it is a good idea to show all the keyboard layouts available in the system. If an administrator sets the system-wide layouts as some set of layouts, I think showing that set would be enough (or perhaps moving the rest of the layouts to a second level menu).
In addition, other system-wide settings related to keyboard layouts aren't honored, such as the layout switch key.

Currently it seems that you cannot set system-wide settings graphically (see bug #854714), but you could still have such settings when upgrading from a previous release, or maybe using console-setup configuration.

[Robert Ancell (robert-ancell)]

Committed with small changes to style (brace on end of line, use of var instead of weak references). There's definitely too many items in the list, but there's not an obvious way of chosing which layouts to show so we should solve that as a separate patch. Haggai, can you open a bug for that?

review: Approve

[Haggai Eran (haggai-eran)]

Sure, I'll open a new bug.

[Martin Pitt (pitti)]

This introduced a major regression, see bug 783827.

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2011-12-09 18:06:18 +0000
+++ src/unity-greeter.vala	2011-12-20 18:06:39 +0000
@@ -131,15 +131,15 @@
 
         if (test_mode)
         {
-            user_list.add_entry ("alice", "가나다라마", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", true);
-            user_list.add_entry ("chris", "Christopher Halse Rogers!!!!!!!!!!!!!!!", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", true);
-            user_list.add_entry ("jorge", "Jorge O Castro", "/usr/share/backgrounds/PurpleDancers_by_Emilio_Merlino.jpg");
-            user_list.add_entry ("ken", "Ken VanDine", "/usr/share/backgrounds/Small_flowers_by_Dariusz_Duma.jpg");
-            user_list.add_entry ("matthew", "Matthew Paul Thomas", "/usr/share/backgrounds/Not_Alone_by_Deacon_MacMillan.jpg");
-            user_list.add_entry ("otto", "Otto Greenslade", "/usr/share/backgrounds/Mount_Snowdon,_Wales_by_Adam_Vellender.jpg");
-            user_list.add_entry ("pitti", "Martin Pitt", "/usr/share/backgrounds/Stalking_Ocelot_by_Sayantan_Chaudhuri.jpg");
-            user_list.add_entry ("desrt", "Ryan Lortie", "/usr/share/backgrounds/Power_of_Words_by_Antonio_Litterio.jpg");
-            user_list.add_entry ("*guest", _("Guest Session"), null, true);
+            user_list.add_entry ("alice", "가나다라마", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", get_layout_by_name ("cn"), true);
+            user_list.add_entry ("chris", "Christopher Halse Rogers!!!!!!!!!!!!!!!", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", null, true);
+            user_list.add_entry ("jorge", "Jorge O Castro", "/usr/share/backgrounds/PurpleDancers_by_Emilio_Merlino.jpg", get_layout_by_name ("us"));
+            user_list.add_entry ("ken", "Ken VanDine", "/usr/share/backgrounds/Small_flowers_by_Dariusz_Duma.jpg", get_layout_by_name ("uk"));
+            user_list.add_entry ("matthew", "Matthew Paul Thomas", "/usr/share/backgrounds/Not_Alone_by_Deacon_MacMillan.jpg", get_layout_by_name ("uk"));
+            user_list.add_entry ("otto", "Otto Greenslade", "/usr/share/backgrounds/Mount_Snowdon,_Wales_by_Adam_Vellender.jpg", get_layout_by_name ("uk"));
+            user_list.add_entry ("pitti", "Martin Pitt", "/usr/share/backgrounds/Stalking_Ocelot_by_Sayantan_Chaudhuri.jpg", get_layout_by_name ("de"));
+            user_list.add_entry ("desrt", "Ryan Lortie", "/usr/share/backgrounds/Power_of_Words_by_Antonio_Litterio.jpg", get_layout_by_name ("ca"));
+            user_list.add_entry ("*guest", _("Guest Session"), null, null, true);
 
             user_list.add_session ("gnome", "Ubuntu");
             user_list.add_session ("gnome-shell", "GNOME");
@@ -151,7 +151,7 @@
         else
         {
             if (greeter.hide_users_hint)
-                user_list.add_entry ("*other", _("Login"), null);
+                user_list.add_entry ("*other", _("Login"), null, null);
             else
             {
                 var users = LightDM.UserList.get_instance ();
@@ -165,7 +165,7 @@
             if (greeter.has_guest_account_hint)
             {
                 debug ("Adding guest account entry");
-                user_list.add_entry ("*guest", _("Guest Session"), null);
+                user_list.add_entry ("*guest", _("Guest Session"), null, null);
             }
 
             if (greeter.select_user_hint != null)
@@ -179,7 +179,18 @@
         user_list.start_session.connect (start_session_cb);
         user_selected_cb (user_list.selected);
     }
-    
+
+    private LightDM.Layout? get_layout_by_name (string name)
+    {
+        unowned GLib.List<weak LightDM.Layout> layouts = LightDM.get_layouts ();
+        foreach (weak LightDM.Layout layout in layouts)
+        {
+            if (layout.name == name)
+                return layout;
+        }
+        return null;
+    }
+
     private void monitors_changed_cb (Gdk.Screen screen)
     {
         Gdk.Rectangle geometry;
@@ -199,7 +210,9 @@
         if (user.real_name == "")
             label = user.name;
 
-        user_list.add_entry (user.name, label, user.background, user.logged_in);
+        var layout = get_layout_by_name (user.layout);
+
+        user_list.add_entry (user.name, label, user.background, layout, user.logged_in);
     }
 
     private void user_removed_cb (LightDM.User user)
@@ -383,7 +396,7 @@
                 text = greeter.authentication_user;
         }
 
-        user_list.add_entry ("*other", text, null);
+        user_list.add_entry ("*other", text, null, null);
     }
 
     private void start_authentication ()

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-12-09 18:06:18 +0000
+++ src/user-list.vala	2011-12-20 18:06:39 +0000
@@ -74,6 +74,9 @@
 
     /* True if should be marked as active */
     public bool is_active;
+
+    /* Keyboard layout to use for this user by default */
+    public LightDM.Layout keyboard_layout;
 }
 
 private class IndicatorMenuItem : Gtk.MenuItem
@@ -312,6 +315,8 @@
     public List<Indicator.Object> indicator_objects;
     private Gtk.CheckMenuItem high_contrast_item;
 
+    private Gtk.Label keyboard_label = null;
+
     private Pid keyboard_pid = 0;
     private Gtk.Window? keyboard_window = null;
 
@@ -515,18 +520,8 @@
         }
     }
 
-    void setup_indicators ()
+    Gtk.Widget make_a11y_indicator ()
     {
-        /* Set indicators to run with reduced functionality */
-        greeter_set_env ("INDICATOR_GREETER_MODE", "1");
-
-        /* Don't allow virtual file systems? */
-        greeter_set_env ("GIO_USE_VFS", "local");
-        greeter_set_env ("GVFS_DISABLE_FUSE", "1");
-
-        /* Hint to have gnome-settings-daemon run in greeter mode */
-        greeter_set_env ("RUNNING_UNDER_GDM", "1");
-
         var a11y_item = new Gtk.MenuItem ();
         var hbox = new Gtk.HBox (false, 3);
         hbox.show ();
@@ -548,6 +543,106 @@
         item.toggled.connect (screen_reader_toggled_cb);
         item.show ();
         a11y_item.submenu.append (item);
+        return a11y_item;
+    }
+
+    void set_layout (LightDM.Layout? layout)
+    {
+        if (layout == null)
+            layout = LightDM.get_layout (); /* default layout */
+
+        var item = layout.get_data<Gtk.RadioMenuItem> ("unity-greeter-radio");
+        if (item != null)
+            item.active = true; /* will trigger callback to do rest of work */
+    }
+
+    void layout_toggled_cb (Gtk.CheckMenuItem item)
+    {
+        if (!item.active)
+            return;
+
+        var layout = item.get_data<LightDM.Layout> ("unity-greeter-layout");
+        if (layout == null)
+            return;
+
+        keyboard_label.label = layout.short_description;
+        LightDM.set_layout (layout);
+    }
+
+    static int cmp_layout (LightDM.Layout? a, LightDM.Layout? b)
+    {
+        if (a == null && b == null)
+            return 0;
+        else if (a == null)
+            return 1;
+        else if (b == null)
+            return -1;
+        else
+        {
+            /* Use a dumb, ascii comparison for now.  If it turns out that some
+               descriptions can be in unicode, we'll have to use libicu's collation
+               algorithms. */
+            return strcmp (a.description, b.description);
+        }
+    }
+
+    Gtk.Widget make_keyboard_indicator ()
+    {
+        var keyboard_item = new Gtk.MenuItem ();
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
+        hbox.show ();
+        keyboard_item.add (hbox);
+        var image = new Gtk.Image.from_icon_name ("keyboard", Gtk.IconSize.LARGE_TOOLBAR);
+        image.show ();
+        hbox.add (image);
+        keyboard_label = new Gtk.Label ("");
+        keyboard_label.width_chars = 2;
+        keyboard_label.show ();
+        hbox.add (keyboard_label);
+        keyboard_item.show ();
+
+        var submenu = new Gtk.Menu ();
+        keyboard_item.set_submenu (submenu);
+
+        List<weak LightDM.Layout> layouts = LightDM.get_layouts ().copy ();
+        layouts.sort (cmp_layout);
+
+        weak SList<Gtk.RadioMenuItem> group = null;
+
+        foreach (weak LightDM.Layout layout in layouts) {
+            var item = new Gtk.RadioMenuItem.with_label (group, layout.description);
+            group = item.get_group ();
+
+            item.show ();
+
+            /* LightDM does not change its layout list during its lifetime, so this is safe */
+            item.set_data("unity-greeter-layout", layout);
+            layout.set_data("unity-greeter-radio", item);
+
+            item.toggled.connect (layout_toggled_cb);
+
+            submenu.append (item);
+        }
+
+        return keyboard_item;
+    }
+
+    void setup_indicators ()
+    {
+        /* Set indicators to run with reduced functionality */
+        greeter_set_env ("INDICATOR_GREETER_MODE", "1");
+
+        /* Don't allow virtual file systems? */
+        greeter_set_env ("GIO_USE_VFS", "local");
+        greeter_set_env ("GVFS_DISABLE_FUSE", "1");
+
+        /* Hint to have gnome-settings-daemon run in greeter mode */
+        greeter_set_env ("RUNNING_UNDER_GDM", "1");
+
+        var keyboard_item = make_keyboard_indicator ();
+        menubar.insert (keyboard_item, (int) menubar.get_children ().length () - 1);
+
+        var a11y_item = make_a11y_indicator ();
         menubar.insert (a11y_item, (int) menubar.get_children ().length () - 1);
 
         debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
@@ -801,7 +896,7 @@
         return null;
     }
 
-    public void add_entry (string name, string label, string? background, bool is_active = false)
+    public void add_entry (string name, string label, string? background, LightDM.Layout? keyboard_layout, bool is_active = false)
     {
         var e = find_entry (name);
         if (e == null)
@@ -813,6 +908,7 @@
         e.layout = create_pango_layout (label);
         e.layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 16"));
         e.background = background != null ? background : default_background;
+        e.keyboard_layout = keyboard_layout;
         e.is_active = is_active;
 
         if (selected_entry == null)
@@ -983,6 +1079,8 @@
                 change_background ();
                 user_selected (selected_entry.name);
             }
+
+            set_layout (selected_entry.keyboard_layout);
         }
 
         scroll_target_location = entries.index (selected_entry);