From 480730067e500de1af2eb616663179e106ea995b Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Mon, 6 Feb 2023 09:51:55 +0100
Subject: Set our own cursor theme and size internally via GtkSettings.

 The gtk and icon themes already work this way.

 Ported from Slick Greeter by Mike Gabriel.

 https://github.com/linuxmint/slick-greeter/commit/97f9f54b686303dec81918d3056194bff2a3163c
---
 data/org.ArcticaProject.arctica-greeter.gschema.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'data/org.ArcticaProject.arctica-greeter.gschema.xml')

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index b0069c2..a264432 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -45,6 +45,14 @@
       <default>'Adwaita'</default>
       <summary>Icon theme to use</summary>
     </key>
+    <key name="cursor-theme-name" type="s">
+      <default>'default'</default>
+      <summary>Cursor theme to use</summary>
+    </key>
+    <key name="cursor-theme-size" type="i">
+      <default>0</default>
+      <summary>Size to use for cursors - 0 is default size</summary>
+    </key>
     <key name="font-name" type="s">
       <default>'Sans 11'</default>
       <summary>Font to use</summary>
-- 
cgit v1.2.3


From 52aa64b64c3485d580385aba6e6123e5950908bd Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Mon, 6 Feb 2023 09:54:07 +0100
Subject: cursor size: Use 24 as a default size instead of 0.

 24 is the default elsewhere, and it's less complicated to fashion
 a setting widget where zero isn't actually zero.

 Ported from Slick Greeter ported by Mike Gabriel.

 https://github.com/linuxmint/slick-greeter/commit/8eead9377b525ba3ae6213248a58b269738791a0
---
 data/org.ArcticaProject.arctica-greeter.gschema.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/org.ArcticaProject.arctica-greeter.gschema.xml')

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index a264432..419e267 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -50,8 +50,8 @@
       <summary>Cursor theme to use</summary>
     </key>
     <key name="cursor-theme-size" type="i">
-      <default>0</default>
-      <summary>Size to use for cursors - 0 is default size</summary>
+      <default>24</default>
+      <summary>Size to use for cursors</summary>
     </key>
     <key name="font-name" type="s">
       <default>'Sans 11'</default>
-- 
cgit v1.2.3


From 3d288d37411db11a4826d6a70a26d842241af3e0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 6 Feb 2023 10:19:28 +0100
Subject: a11y: Make the onboard layout configurable.

 Original patch by Clement Lefebvre (Slick Greeter).

 https://github.com/linuxmint/slick-greeter/commit/ae090039efff87ad8b9b856f3fe451f9f41d21be

 Modified by Mike Gabriel (change: don't store the complete layout path
 in gsettings).
---
 data/org.ArcticaProject.arctica-greeter.gschema.xml |  4 ++++
 src/menubar.vala                                    | 12 ++++++++++--
 src/settings.vala                                   |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'data/org.ArcticaProject.arctica-greeter.gschema.xml')

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index 419e267..9f7fc6e 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -147,5 +147,9 @@
       <default>'auto'</default>
       <summary>Monitor on which to show the Login GUI</summary>
     </key>
+    <key name="onscreen-keyboard-layout" type="s">
+      <default>'Small'</default>
+      <summary>Name of the onscreen keyboard layout (see /usr/share/onboard/layouts/ for available layout names).</summary>
+    </key>
   </schema>
 </schemalist>
diff --git a/src/menubar.vala b/src/menubar.vala
index a417a03..87e0bf7 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -536,9 +536,17 @@ public class MenuBar : Gtk.MenuBar
             try
             {
                 string[] argv;
+                string cmd;
                 int onboard_stdout_fd;
-
-                Shell.parse_argv ("onboard --xid", out argv);
+                var layout = AGSettings.get_string (AGSettings.KEY_ONSCREEN_KEYBOARD_LAYOUT);
+                var file = File.new_for_path ("/usr/share/onboard/layouts/%s.onboard".printf (layout));
+                if (file.query_exists ()) {
+                    cmd = "onboard --xid --layout='/usr/share/onboard/layouts/%s.onboard'".printf (layout);
+                }
+                else {
+                    cmd = "onboard --xid";
+                }
+                Shell.parse_argv (cmd, out argv);
                 Process.spawn_async_with_pipes (null,
                                                 argv,
                                                 null,
diff --git a/src/settings.vala b/src/settings.vala
index 05f54fe..9eef320 100644
--- a/src/settings.vala
+++ b/src/settings.vala
@@ -41,6 +41,7 @@ public class AGSettings : Object
     public const string KEY_XFT_HINTSTYLE = "xft-hintstyle";
     public const string KEY_XFT_RGBA = "xft-rgba";
     public const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard";
+    public const string KEY_ONSCREEN_KEYBOARD_LAYOUT = "onscreen-keyboard-layout";
     public const string KEY_HIGH_CONTRAST = "high-contrast";
     public const string KEY_BIG_FONT = "big-font";
     public const string KEY_SCREEN_READER = "screen-reader";
-- 
cgit v1.2.3