From 9c26d5983e94e7d70a77359c0b8ceeeb926085b1 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 17 Jun 2025 16:08:25 +0200 Subject: Separate layout and settings for hardware and on-screen keyboards Refurbished by Mike Gabriel, avoiding white-space changes, variable renamings and internal code block moves. Fixes: https://salsa.debian.org/ubports-team/lomiri-system-settings/-/issues/20 --- src/keyboard.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/keyboard.h') diff --git a/src/keyboard.h b/src/keyboard.h index 49c21056..fd30cf6d 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -46,10 +46,12 @@ struct _KeyboardClass GType keyboard_get_type(void); Keyboard* keyboard_new(); void keyboard_AddSource(Keyboard *pKeyboard); -guint keyboard_GetNumLayouts(Keyboard *pKeyboard); +guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK); guint keyboard_GetLayoutIndex (Keyboard *pKeyboard); -void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId); -void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout); +void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId); +void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK); +gboolean keyboard_hasHardwareKeyboard(Keyboard *pKeyboard); +gboolean keyboard_hasSoftwareKeyboard(Keyboard *pKeyboard); G_END_DECLS -- cgit v1.2.3 From a8a2962376b5c106af481c17035a89a14bdfc3c8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 22 Jun 2025 21:42:43 +0200 Subject: src/keyboard*: Remember nLayout and nLayoutOSK separately. --- src/keyboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/keyboard.h') diff --git a/src/keyboard.h b/src/keyboard.h index fd30cf6d..206c4bf3 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -47,7 +47,7 @@ GType keyboard_get_type(void); Keyboard* keyboard_new(); void keyboard_AddSource(Keyboard *pKeyboard); guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK); -guint keyboard_GetLayoutIndex (Keyboard *pKeyboard); +guint keyboard_GetLayoutIndex (Keyboard *pKeyboard, gboolean bOSK); void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId); void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK); gboolean keyboard_hasHardwareKeyboard(Keyboard *pKeyboard); -- cgit v1.2.3