virtual keyboard: Add layout switch button.

Author: mtwebster

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -148,23 +148,6 @@ class CinnamonKeyboardApplet extends Applet.Applet {
         this.menu.toggle();
     }
 
-    _createFlagIcon(source, actorClass, size) {
-        let actor = null;
-        let name = source.flagName;
-
-        const file = Gio.file_new_for_path(KeyboardManager.getFlagFileName(name));
-        if (file.query_exists(null)) {
-            actor = new KeyboardManager.SubscriptableFlagIcon({
-                style_class: actorClass,
-                file: file,
-                subscript: source.dupeId > 0 ? String(source.dupeId) : null,
-                height: size,
-            });
-        }
-
-        return actor;
-    }
-
     _syncConfig() {
         this._layoutItems.forEach((v, k, m) => v.destroy());
         this._layoutItems = new Map()
@@ -177,7 +160,7 @@ class CinnamonKeyboardApplet extends Applet.Applet {
             let actor = null;
 
             if (this._inputSourcesManager.showFlags) {
-                actor = this._createFlagIcon(source, POPUP_MENU_ICON_STYLE_CLASS, 22 * global.ui_scale);
+                actor = this._inputSourcesManager.createFlagIcon(source, POPUP_MENU_ICON_STYLE_CLASS, 22 * global.ui_scale);
             }
 
             if (actor == null) {
@@ -219,7 +202,7 @@ class CinnamonKeyboardApplet extends Applet.Applet {
         const iconSize = this.getPanelIconSize(St.IconType.SYMBOLIC);
 
         if (this._inputSourcesManager.showFlags) {
-            actor = this._createFlagIcon(selected, APPLET_ICON_STYLE_CLASS, iconSize);
+            actor = this._inputSourcesManager.createFlagIcon(selected, APPLET_ICON_STYLE_CLASS, iconSize);
         }
 
         if (actor == null) {

js/ui/keyboardManager.js

@@ -931,6 +931,23 @@ var InputSourceManager = class {
     get showFlags() {
         return this._interface_settings.get_boolean("keyboard-layout-show-flags");
     }
+
+    createFlagIcon(source, actorClass, size) {
+        let actor = null;
+        let name = source.flagName;
+
+        const file = Gio.file_new_for_path(getFlagFileName(name));
+        if (file.query_exists(null)) {
+            actor = new SubscriptableFlagIcon({
+                style_class: actorClass,
+                file: file,
+                subscript: source.dupeId > 0 ? String(source.dupeId) : null,
+                height: size,
+            });
+        }
+
+        return actor;
+    }
 };
 Signals.addSignalMethods(InputSourceManager.prototype);
 

js/ui/virtualKeyboard.js

@@ -39,10 +39,11 @@ const dir_keys =  [{ keyval: Clutter.KEY_Left,   label: '←',
                    { keyval: Clutter.KEY_Up,     label: '↑',                                 extraClassName: 'non-alpha-key' },
                    { keyval: Clutter.KEY_Down,   label: '↓',                                 extraClassName: 'non-alpha-key'},
                    { keyval: Clutter.KEY_Right,  label: '→',                                 extraClassName: 'non-alpha-key' }];
+const layout_key = { action: 'next-layout',      icon: 'input-keyboard-symbolic',            extraClassName: 'non-alpha-key' };
 
 const defaultKeysPre = [
-    [[escape_key], [tab_key], [{ width: 1.5, level: 1, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-filled-symbolic' }], [_123_key]],
-    [[escape_key], [tab_key], [{ width: 1.5, level: 0, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-filled-symbolic' }], [_123_key]],
+    [[escape_key], [tab_key], [{ width: 1.5, level: 1, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-filled-symbolic' }], [layout_key, _123_key]],
+    [[escape_key], [tab_key], [{ width: 1.5, level: 0, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-filled-symbolic' }], [layout_key, _123_key]],
     [[escape_key], [tab_key], [{ label: '=/<', width: 1.5, level: 3, extraClassName: 'non-alpha-key' }], [abc_key]],
     [[escape_key], [tab_key], [{ label: '?123', width: 1.5, level: 2, extraClassName: 'non-alpha-key' }], [abc_key]],
 ];
@@ -251,6 +252,13 @@ var Key = GObject.registerClass({
         this._longPress = false;
     }
 
+    updateKey(label, icon = null) {
+        this.key = label || "";
+        this.keyButton.destroy();
+        this.keyButton = this._makeKey(this.key, icon);
+        this.add_child(this.keyButton);
+    }
+
     _onDestroy() {
         if (this._boxPointer) {
             this._boxPointer.destroy();
@@ -384,9 +392,14 @@ var Key = GObject.registerClass({
         });
 
         if (icon) {
-            let child = new St.Icon({ icon_name: icon });
-            button.set_child(child);
-            this._icon = child;
+            if (icon instanceof Clutter.Actor) {
+                button.set_child(icon);
+                this._icon = icon;
+            } else {
+                let child = new St.Icon({ icon_name: icon });
+                button.set_child(child);
+                this._icon = child;
+            }
         } else {
             let label = GLib.markup_escape_text(key, -1);
             button.set_label(label);
@@ -468,6 +481,29 @@ var Key = GObject.registerClass({
     }
 });
 
+var ActiveGroupKey = GObject.registerClass({}, class ActiveGroupKey extends Key {
+    _init(controller) {
+        this._controller = controller;
+        let [shortName, icon] = this._controller.getCurrentGroupLabelIcon();
+
+        super._init(shortName, [], icon);
+        this._groupChangedId = this._controller.connect('active-group', this._onGroupChanged.bind(this));
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    _onGroupChanged(id) {
+        let [shortName, icon] = this._controller.getCurrentGroupLabelIcon();
+        this.updateKey(shortName, icon);
+    }
+
+    _onDestroy() {
+        if (this._groupChangedId > 0) {
+            this._controller.disconnect(this._groupChangedId);
+            this._groupChangedId = 0;
+        }
+    }
+});
+
 var KeyboardModel = class {
     constructor(groupName) {
         let names = [groupName];
@@ -1006,7 +1042,11 @@ class Keyboard extends St.BoxLayout {
             let action = key.action;
             let icon = key.icon;
 
-            extraButton = new Key(key.label || '', [], icon);
+            if (action === 'next-layout') {
+                extraButton = new ActiveGroupKey(this._keyboardController);
+            } else {
+                extraButton = new Key(key.label || '', [], icon);
+            }
 
             // extraButton.keyButton.add_style_class_name('default-key');
             if (key.extraClassName != null)
@@ -1030,6 +1070,8 @@ class Keyboard extends St.BoxLayout {
                     this._keyboardController.keyvalRelease(keyval);
                 else if (action == 'hide')
                     this.close();
+                else if (action == 'next-layout')
+                    this._keyboardController.activateNextGroup();
             });
 
             if (switchToLevel == 0) {
@@ -1458,6 +1500,27 @@ var KeyboardController = class {
 
     getIbusInputActive() {
         return this._currentSource.type === "ibus";
+
+    activateNextGroup() {
+        let new_index = this._inputSourceManager.currentSource.index + 1;
+        if (new_index == this._inputSourceManager.numInputSources) {
+            new_index = 0;
+        }
+
+        this._inputSourceManager.activateInputSourceIndex(new_index);
+    }
+
+    getCurrentGroupLabelIcon() {
+        let actor = null;
+
+        if (this._inputSourceManager.showFlags) {
+            actor = this._inputSourceManager.createFlagIcon(this._currentSource, null, 16);
+        }
+
+        if (actor == null) {
+            return [this._currentSource.shortName, null];
+        }
+        return [null, actor];
     }
 
     commitString(string, fromKey) {