summaryrefslogtreecommitdiffstats
path: root/tdecore/kglobalaccel_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-07 15:09:33 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-07 15:09:33 -0500
commit5df549ce8d57f5622ab5e0b9037994a07eb7f28d (patch)
treea0f2eb1cb38627e6da7a1132dcf9568a9f800c72 /tdecore/kglobalaccel_x11.cpp
parenta5fb7a12308e9883da7f557644d6710bf7a0656d (diff)
downloadtdelibs-5df549ce8d57f5622ab5e0b9037994a07eb7f28d.tar.gz
tdelibs-5df549ce8d57f5622ab5e0b9037994a07eb7f28d.zip
Update calls to deprecated XKeycodeToKeysym function
Diffstat (limited to 'tdecore/kglobalaccel_x11.cpp')
-rw-r--r--tdecore/kglobalaccel_x11.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 4f73c4ffd..260bc39e1 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -41,6 +41,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
#include <X11/keysym.h>
#include <fixx11h.h>
@@ -172,7 +173,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
// HACK: make Alt+Print work
// only do this for the Xorg default keyboard keycodes,
// other mappings (e.g. evdev) don't need or want it
- if( key.sym() == XK_Sys_Req && XKeycodeToKeysym( tqt_xdisplay(), 111, 0 ) == XK_Print ) {
+ if( key.sym() == XK_Sys_Req && XkbKeycodeToKeysym( tqt_xdisplay(), 111, 0, 0 ) == XK_Print ) {
keyModX |= KKeyServer::modXAlt();
keyCodeX = 111;
}
@@ -332,7 +333,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
// e.g., KP_4 => Shift+KP_Left, and Shift+KP_4 => KP_Left.
if( pEvent->xkey.state & KKeyServer::modXNumLock() ) {
// TODO: what's the xor operator in c++?
- uint sym = XKeycodeToKeysym( tqt_xdisplay(), codemod.code, 0 );
+ uint sym = XkbKeycodeToKeysym( tqt_xdisplay(), codemod.code, 0, 0 );
// If this is a keypad key,
if( sym >= XK_KP_Space && sym <= XK_KP_9 ) {
switch( sym ) {