Merge lp:~attente/indicator-keyboard/unity-greeter-default-layout into lp:indicator-keyboard

[William Hua]

Set the selected user's first keyboard layout whenever it changes under unity-greeter. (LP #1233945)

Set the selected user's first keyboard layout whenever it changes under unity-greeter. (LP #1233945)

This needs https://code.launchpad.net/~attente/unity-greeter/entry-selected-signal/+merge/188755 to actually work.

[lp:~attente/indicator-keyboard/unity-greeter-default-layout]

122. By William Hua on 2013-10-02

ocd

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/27/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/28/rebuild

review: Approve (continuous-integration)

[lp:~attente/indicator-keyboard/unity-greeter-default-layout]

123. By William Hua on 2013-10-02

Get greeter unique bus name from environment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/29/rebuild

review: Approve (continuous-integration)

[lp:~attente/indicator-keyboard/unity-greeter-default-layout]

124. By William Hua on 2013-10-02

Switch to default layout for non-users in unity-greeter.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/30/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

This works for me. I don't want to top-approve because I'm not on the indicator team, but it's fine from an end-user standpoint.

review: Approve

[Ted Gould (ted)]

Code looks fine. If it works for mterry, that's good enough for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2013-08-07 20:20:23 +0000
+++ lib/Makefile.am	2013-10-02 18:56:23 +0000
@@ -6,9 +6,10 @@
                --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_service_SOURCES = main.vala   \
-                                     source.vala \
-                                     common.vala
+indicator_keyboard_service_SOURCES = main.vala    \
+                                     source.vala  \
+                                     common.vala  \
+                                     greeter.vala
 indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
                                        --pkg gee-1.0              \
                                        --pkg posix                \

=== added file 'lib/greeter.vala'
--- lib/greeter.vala	1970-01-01 00:00:00 +0000
+++ lib/greeter.vala	2013-10-02 18:56:23 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: William Hua <[e-mail]>
+ */
+
+[DBus (name="com.canonical.UnityGreeter.List")]
+public interface Greeter : Object {
+
+	public abstract string get_active_entry () throws IOError;
+	public abstract void set_active_entry (string entry_name) throws IOError;
+
+	public signal void entry_selected (string entry_name);
+}

=== modified file 'lib/main.vala'
--- lib/main.vala	2013-09-21 15:55:33 +0000
+++ lib/main.vala	2013-10-02 18:56:23 +0000
@@ -41,6 +41,8 @@
 	private MenuModel? menu_model;
 	private Menu? sources_menu;
 
+	private Greeter? greeter;
+	private string? greeter_user;
 	private uint lightdm_current;
 
 	[DBus (visible = false)]
@@ -55,6 +57,18 @@
 			Gdk.init (ref args);
 		}
 
+		if (is_login_user ()) {
+			var name = Environment.get_variable ("UNITY_GREETER_DBUS_NAME");
+
+			if (name != null) {
+				Bus.watch_name (BusType.SESSION,
+				                (!) name,
+				                BusNameWatcherFlags.NONE,
+				                handle_name_appeared,
+				                handle_name_vanished);
+			}
+		}
+
 		indicator_settings = new Settings ("com.canonical.indicator.keyboard");
 		indicator_settings.changed["visible"].connect (handle_changed_visible);
 
@@ -112,6 +126,108 @@
 	}
 
 	[DBus (visible = false)]
+	private void update_greeter_user () {
+		if (greeter_user == null && greeter != null) {
+			try {
+				greeter_user = ((!) greeter).get_active_entry ();
+			} catch (IOError error) {
+				warning ("error: %s", error.message);
+			}
+		}
+
+		string? source = null;
+
+		if (greeter_user != null) {
+			var manager = Act.UserManager.get_default ();
+
+			if (manager.is_loaded) {
+				Act.User? user = manager.get_user ((!) greeter_user);
+
+				if (user != null && ((!) user).is_loaded) {
+					VariantIter outer;
+					VariantIter inner;
+
+					var sources = ((!) user).input_sources;
+					sources.get ("aa{ss}", out outer);
+
+					while (outer.next ("a{ss}", out inner)) {
+						unowned string key;
+						unowned string value;
+
+						while (inner.next ("{&s&s}", out key, out value)) {
+							if (key == "xkb") {
+								source = value;
+								break;
+							}
+						}
+
+						if (source != null) {
+							break;
+						}
+					}
+
+					if (source == null) {
+						var layouts = ((!) user).xkeyboard_layouts;
+
+						if (layouts.length <= 0) {
+							var user_list = LightDM.UserList.get_instance ();
+							LightDM.User? light_user = user_list.get_user_by_name ((!) greeter_user);
+
+							if (light_user != null) {
+								layouts = ((!) light_user).get_layouts ();
+							}
+						}
+
+						if (layouts.length > 0) {
+							source = layouts[0];
+							source = ((!) source).replace (" ", "+");
+							source = ((!) source).replace ("\t", "+");
+						}
+					}
+				}
+			}
+		}
+
+		if (source == null) {
+			LightDM.Layout? layout = LightDM.get_layout ();
+
+			if (layout != null) {
+				source = ((!) layout).name;
+
+				if (source != null) {
+					source = ((!) source).replace (" ", "+");
+					source = ((!) source).replace ("\t", "+");
+				}
+			}
+		}
+
+		if (source != null) {
+			var array = source_settings.get_value ("sources");
+
+			for (int i = 0; i < array.n_children (); i++) {
+				unowned string type;
+				unowned string name;
+
+				array.get_child (i, "(&s&s)", out type, out name);
+
+				if (type == "xkb" && name == (!) source) {
+					source_settings.set_uint ("current", i);
+					break;
+				}
+			}
+		}
+	}
+
+	[DBus (visible = false)]
+	private void handle_entry_selected (string entry_name) {
+		if (greeter_user == null || entry_name != (!) greeter_user) {
+			greeter_user = entry_name;
+
+			update_greeter_user ();
+		}
+	}
+
+	[DBus (visible = false)]
 	private void migrate_keyboard_layouts () {
 		if (is_login_user ()) {
 			lightdm_current = source_settings.get_uint ("current");
@@ -285,15 +401,20 @@
 			}
 		}
 
-		var layout = LightDM.get_layout ();
-
-		var source = layout.name;
-		source = source.replace (" ", "+");
-		source = source.replace ("\t", "+");
-
-		if (!added.contains (source)) {
-			list.add (source);
-			added.add (source);
+		LightDM.Layout? layout = LightDM.get_layout ();
+
+		if (layout != null) {
+			string? source = ((!) layout).name;
+
+			if (source != null) {
+				source = ((!) source).replace (" ", "+");
+				source = ((!) source).replace ("\t", "+");
+
+				if (!added.contains ((!) source)) {
+					list.add ((!) source);
+					added.add ((!) source);
+				}
+			}
 		}
 
 		var builder = new VariantBuilder (new VariantType ("a(ss)"));
@@ -309,6 +430,8 @@
 		}
 
 		source_settings.set_value ("sources", builder.end ());
+
+		update_greeter_user ();
 	}
 
 	[DBus (visible = false)]
@@ -617,6 +740,21 @@
 	}
 
 	[DBus (visible = false)]
+	private void handle_name_appeared (DBusConnection connection, string name, string name_owner) {
+		try {
+			greeter = Bus.get_proxy_sync (BusType.SESSION, name, "/list");
+			((!) greeter).entry_selected.connect (handle_entry_selected);
+		} catch (IOError error) {
+			warning ("error: %s", error.message);
+		}
+	}
+
+	[DBus (visible = false)]
+	private void handle_name_vanished (DBusConnection connection, string name) {
+		greeter = null;
+	}
+
+	[DBus (visible = false)]
 	private void handle_bus_acquired (DBusConnection connection, string name) {
 		try {
 			connection.export_action_group ("/com/canonical/indicator/keyboard", get_action_group ());