[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gtksalframe.cxx |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 6408b735283751cf6cacb8c758b99a2d90a9868a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 30 16:42:15 2015 +0000

    gtk3: implement GetIndicatorState
    
    Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
    (cherry picked from commit 503864037b2f6b73979f46d11df5d365b81f9dcf)

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 923581d..4a9fa43 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2786,8 +2786,18 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
 #if !GTK_CHECK_VERSION(3,0,0)
     return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState();
 #else
-    g_warning ("missing get indicator state");
-    return KeyIndicatorState::NONE;
+    KeyIndicatorState nState = KeyIndicatorState::NONE;
+
+    GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay());
+
+    if (gdk_keymap_get_caps_lock_state(pKeyMap))
+        nState |= KeyIndicatorState::CAPSLOCK;
+    if (gdk_keymap_get_num_lock_state(pKeyMap))
+        nState |= KeyIndicatorState::NUMLOCK;
+    if (gdk_keymap_get_scroll_lock_state(pKeyMap))
+        nState |= KeyIndicatorState::SCROLLLOCK;
+
+    return nState;
 #endif
 }