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).
---
 src/menubar.vala | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/menubar.vala')

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,
-- 
cgit v1.2.3