Merge branch 'sunweaver-pr/separate-sections-for-osk'

Attributes GH PR #81: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/81

1 files changed, 15 insertions, 4 deletions

diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c
index 27dfb97c..75dabd6d 100644
--- a/src/keyboard-x11.c
+++ b/src/keyboard-x11.c
@@ -42,6 +42,7 @@ struct _KeyboardPrivate
     GHashTable *lLayouts;
     Display *pDisplay;
     guint nLayout;
+    guint nLayoutOSK;
     gint nXkbEventType;
     XklConfigRec *pConfigRec;
     GSList *lLayoutRec;
@@ -369,7 +370,7 @@ void keyboard_AddSource(Keyboard *pKeyboard)
     }
 }
 
-guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
+guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK)
 {
     guint nLayouts = 0;
 
@@ -385,12 +386,12 @@ guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
     return nLayouts;
 }
 
-guint keyboard_GetLayoutIndex (Keyboard *pKeyboard)
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard, gboolean bOSK)
 {
     return pKeyboard->pPrivate->nLayout;
 }
 
-void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId)
+void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId)
 {
     if (nLayout == -1)
     {
@@ -442,7 +443,7 @@ void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gc
     }
 }
 
-void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout)
+void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK)
 {
     if (isGreeter() == FALSE)
     {
@@ -572,6 +573,16 @@ static void onUserChanged (GDBusConnection *pConnection, const gchar *sSender, c
     }
 }
 
+gboolean keyboard_hasHardwareKeyboard (Keyboard *self)
+{
+    return TRUE;
+}
+
+gboolean keyboard_hasSoftwareKeyboard (Keyboard *self)
+{
+    return FALSE;
+}
+
 static void keyboard_init(Keyboard *self)
 {
     self->pPrivate = keyboard_get_instance_private(self);