Enable with settings and touch mode, squash to initial osk manager

Author: leolost2605

src/OSK/OSKManager.vala

@@ -12,12 +12,16 @@ public class Gala.OSKManager : Object {
     private const string OSK_BUS_NAME = "io.elementary.OSK";
     private const string OSK_OBJECT_PATH = "/io/elementary/OSK";
 
+    private const string OSK_SETTINGS_KEY = "screen-keyboard-enabled";
+
     public Meta.Display display { private get; construct; }
     public InputMethod im { private get; construct; }
 
     public int monitor { get; private set; default = 0; }
     public bool visible { get; private set; default = false; }
 
+    private static Settings settings = new Settings ("org.gnome.desktop.a11y.applications");
+
     private OSKProxy? osk;
     private OSKReceiver? receiver;
 
@@ -28,6 +32,9 @@ public class Gala.OSKManager : Object {
     }
 
     construct {
+        settings.changed[OSK_SETTINGS_KEY].connect (sync_enabled);
+        Clutter.get_default_backend ().get_default_seat ().notify["touch-mode"].connect (sync_enabled);
+
         Bus.watch_name (SESSION, OSK_BUS_NAME, NONE, () => osk_appeared.begin (), osk_lost);
 
         im.input_panel_state.connect (on_input_panel_state_changed);
@@ -54,7 +61,10 @@ public class Gala.OSKManager : Object {
     }
 
     private void sync_enabled () {
-        enabled = true;
+        var manually_enabled = settings.get_boolean (OSK_SETTINGS_KEY);
+        var auto_enabled = Clutter.get_default_backend ().get_default_seat ().touch_mode;
+
+        enabled = manually_enabled || auto_enabled;
 
         if (osk != null) {
             osk.set_enabled.begin (enabled);