aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/org.ArcticaProject.arctica-greeter.gschema.xml4
-rw-r--r--src/arctica-greeter.vala104
-rw-r--r--src/settings.vala1
3 files changed, 101 insertions, 8 deletions
diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index dad830a..7399af4 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -211,6 +211,10 @@
<default>'Nightshade'</default>
<summary>Name of the onscreen keyboard theme (see /usr/share/onboard/themes/*.theme for available theme names).</summary>
</key>
+ <key name="high-contrast-onscreen-keyboard-theme" type="s">
+ <default>'HighContrast'</default>
+ <summary>Name of the onscreen keyboard theme when in high-contrast mode (see /usr/share/onboard/themes/*.theme for available theme names).</summary>
+ </key>
<key name="hide-default-xsession" type="b">
<default>false</default>
<summary>Whether to hide the 'lightdm-xsession' default X11 session type.</summary>
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index d0f9902..c327ed3 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -1351,14 +1351,24 @@ public class DBusServer : Object
private ArcticaGreeter pGreeter;
private Pid nOrca = 0;
private Pid nOnBoard = 0;
+ private Gtk.Socket pSocket = null;
+ private bool high_contrast_osk = AGSettings.get_boolean(AGSettings.KEY_HIGH_CONTRAST);
private void closePid (ref Pid nPid)
{
if (nPid > 0)
{
- Posix.kill (nPid, Posix.Signal.TERM);
+
+ /* Make sure we operate on the complete process group here
+ * (POSIX specs: prepend a '-' to the PID to affect the complete
+ * process group).
+ *
+ * Otherwise a follow-up onboard process (group) will refuse to start
+ * immediately after having killed the previous process (group).
+ */
+ Posix.kill (-nPid, Posix.Signal.TERM);
int nStatus;
- Posix.waitpid (nPid, out nStatus, 0);
+ Posix.waitpid (-nPid, out nStatus, 0);
nPid = 0;
}
}
@@ -1418,18 +1428,62 @@ public class DBusServer : Object
public void ToggleOnBoard (bool bActive) throws GLib.DBusError, GLib.IOError
{
- AGSettings.set_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD, bActive);
- if (this.pGreeter.pKeyboardWindow == null)
+ int nId = 0;
+ var sTheme = "";
+
+ if (AGSettings.get_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD) != bActive)
+ {
+ AGSettings.set_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD, bActive);
+ }
+
+ if (high_contrast_osk != AGSettings.get_boolean(AGSettings.KEY_HIGH_CONTRAST))
+ {
+ if (nOnBoard != 0)
+ {
+
+ /* Hide the OSK window while fiddling with it...
+ */
+ this.pGreeter.pKeyboardWindow.visible = false;
+
+ /* calling closePid sets nOnBoard to 0 */
+ debug ("Closing previous keyboard with PID %d", nOnBoard);
+ closePid (ref nOnBoard);
+
+ /* Sending SIGTERM to the plug (i.e. the onboard process group)
+ * will destroy pSocket, so NULLing it now.
+ */
+ debug ("Tearing down OSK's Gtk.Socket");
+ this.pGreeter.pKeyboardWindow.remove (pSocket);
+ pSocket = null;
+
+ /* Start with fresh Gkt.Window object for OSK relaunch.
+ */
+ debug ("Tearing down OSK's Gtk.Window");
+ this.pGreeter.pKeyboardWindow.close();
+ this.pGreeter.pKeyboardWindow = null;
+
+ }
+ high_contrast_osk = AGSettings.get_boolean(AGSettings.KEY_HIGH_CONTRAST);
+ }
+
+ if (nOnBoard == 0)
{
- int nId = 0;
try
{
+
var sLayout = AGSettings.get_string (AGSettings.KEY_ONSCREEN_KEYBOARD_LAYOUT);
var sLayoutPath = "/usr/share/onboard/layouts/%s.onboard".printf (sLayout);
var pLayoutFile = File.new_for_path (sLayoutPath);
- var sTheme = AGSettings.get_string (AGSettings.KEY_ONSCREEN_KEYBOARD_THEME);
+ if (high_contrast_osk)
+ {
+ sTheme = AGSettings.get_string (AGSettings.KEY_HIGH_CONTRAST_ONSCREEN_KEYBOARD_THEME);
+ }
+ else
+ {
+ sTheme = AGSettings.get_string (AGSettings.KEY_ONSCREEN_KEYBOARD_THEME);
+ }
var sThemePath = "/usr/share/onboard/themes/%s.theme".printf (sTheme);
var pThemeFile = File.new_for_path (sThemePath);
var sLayoutArgs = "";
@@ -1447,10 +1501,20 @@ public class DBusServer : Object
}
string sCommand = "onboard --xid %s %s".printf (sLayoutArgs, sThemeArgs);
+ debug ("Launching OSK: '%s'", sCommand);
+
string[] lArgs;
Shell.parse_argv (sCommand, out lArgs);
int nOnboardFD;
- Process.spawn_async_with_pipes (null, lArgs, null, SpawnFlags.SEARCH_PATH, null, out nOnBoard, null, out nOnboardFD, null);
+ Process.spawn_async_with_pipes (null,
+ lArgs,
+ null,
+ SpawnFlags.SEARCH_PATH,
+ null,
+ out nOnBoard,
+ null,
+ out nOnboardFD,
+ null);
var pFile = FileStream.fdopen (nOnboardFD, "r");
var sText = new char[1024];
@@ -1466,15 +1530,35 @@ public class DBusServer : Object
return;
}
+ }
- var pSocket = new Gtk.Socket ();
+ if (pSocket == null)
+ {
+ debug ("Creating Gtk.Socket for OSK");
+ pSocket = new Gtk.Socket ();
pSocket.show ();
+ }
+
+ if ((this.pGreeter.pKeyboardWindow == null) && (pSocket != null))
+ {
+ debug ("Creating Gtk.Window for OSK");
this.pGreeter.pKeyboardWindow = new Gtk.Window ();
this.pGreeter.pKeyboardWindow.accept_focus = false;
this.pGreeter.pKeyboardWindow.focus_on_map = false;
+ this.pGreeter.pKeyboardWindow.set_title("OSK (theme: %s)".printf(sTheme));
+ }
+
+ if ((this.pGreeter.pKeyboardWindow != null) && (pSocket != null) && (nId != 0))
+ {
+ /* attach the GtkSocket, which will host the onboard keyboard, to pKeyboardWindow */
+ debug ("Adding OSK Gtk.Socket to OSK Gtk.Window");
this.pGreeter.pKeyboardWindow.add (pSocket);
+
+ debug ("Attaching new onboard process to OSK Gtk.Socket (+ Gtk.Window)");
pSocket.add_id (nId);
+ /* resize the keyboard window to cover the lower part of the screen */
+ debug ("Resizing OSK window.");
var pDisplay = this.pGreeter.main_window.get_display ();
var pMonitor = pDisplay.get_monitor_at_window (this.pGreeter.main_window.get_window ());
Gdk.Rectangle cRect = pMonitor.get_geometry ();
@@ -1537,5 +1621,9 @@ public class DBusServer : Object
{
var agsettings = new AGSettings ();
agsettings.high_contrast = bActive;
+
+ /* Trigger onboard restart with correct theme */
+ debug ("High-Contrast mode toggled (new state: %b), refreshing OSK, as well.", bActive);
+ ToggleOnBoard (AGSettings.get_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD));
}
}
diff --git a/src/settings.vala b/src/settings.vala
index 656b52a..b870bd2 100644
--- a/src/settings.vala
+++ b/src/settings.vala
@@ -49,6 +49,7 @@ public class AGSettings : Object
public const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard";
public const string KEY_ONSCREEN_KEYBOARD_LAYOUT = "onscreen-keyboard-layout";
public const string KEY_ONSCREEN_KEYBOARD_THEME = "onscreen-keyboard-theme";
+ public const string KEY_HIGH_CONTRAST_ONSCREEN_KEYBOARD_THEME = "high-contrast-onscreen-keyboard-theme";
public const string KEY_HIGH_CONTRAST = "high-contrast";
public const string KEY_BIG_FONT = "big-font";
public const string KEY_SCREEN_READER = "screen-reader";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 00:55:29 +0000