From 45fb5561be6e828c78180c781f74d0ae9d1c3ea4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 10 Jan 2012 15:25:57 -0600
Subject: Enable xtest support flag

---
 kxkb/CMakeLists.txt |  3 ++-
 kxkb/kcmmisc.cpp    | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'kxkb')

diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index 703591ad3..f36a003bd 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -22,6 +22,7 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${XTEST_LIBDIR}
 )
 
 
@@ -39,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC
     extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
     pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui
     kcmmisc.cpp kcmmiscwidget.ui
-  LINK kio-shared xkbfile
+  LINK kio-shared xkbfile ${XTEST_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index b4c18a483..8850d8906 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -344,6 +344,21 @@ int xkb_set_off()
     return 1;
     }
 
+int xkb_state()
+    {
+    unsigned int mask;
+    unsigned int numlockState;
+    XkbStateRec xkbState;
+    if( !xkb_init())
+        return 0;
+    mask = xkb_numlock_mask();
+    if( mask == 0 )
+        return 0;
+    XkbGetState( dpy, XkbUseCoreKbd, &xkbState);
+    numlockState = xkbState.locked_mods & mask;
+    return numlockState;
+    }
+
 int xkb_toggle()
     {
     unsigned int mask;
@@ -443,7 +458,14 @@ void numlock_toggle()
         return;
 #endif
 #ifdef HAVE_XTEST
+#ifdef HAVE_XKB
+    if (xkb_state())
+        xtest_set_on();
+    else
+        xtest_set_off();
+#else // HAVE_XKB
     xtest_toggle();
+#endif // HAVE_XKB
 #endif
     }
 // This code is taken from xset utility from XFree 4.3 (http://www.xfree86.org/)
-- 
cgit v1.2.1