From 443169bdcb47dfecf18da981119342b9f19eb84f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 Aug 2012 15:24:47 -0500
Subject: [PATCH] Update calls to deprecated XKeycodeToKeysym function

---
 kcontrol/keys/modifiers.cpp | 5 +++--
 twin/killwindow.cpp         | 3 ++-
 twin/workspace.cpp          | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index d9b3075f1..db304f0c5 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -20,6 +20,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 #include <X11/keysymdef.h>
 #include <ctype.h>
 #undef NONE
@@ -300,7 +301,7 @@ void ModifiersModule::updateWidgets()
 	for( int iMod = 0; iMod < 8; iMod++ ) {
 		// Find the default modifier index for the Win key.
 		/*if( iMod > Mod2Index ) {
-			uint symX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0 );
+			uint symX = XkbKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0, 0 );
 			if( symX == XK_Super_L || symX == XK_Super_R )
 				iModWinDef = iMod;
 			else if( iModWinDef == -1 && (symX == XK_Meta_L || symX == XK_Meta_R) )
@@ -309,7 +310,7 @@ void ModifiersModule::updateWidgets()
 
 		// Insert items into X modifier map list
 		for( int iKey = 0; iKey < xmk->max_keypermod; iKey++ ) {
-			uint symX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0 );
+			uint symX = XkbKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0, 0 );
 			m_plstXMods->itemAtIndex( iMod )->setText( 1 + iKey, XKeysymToString( symX ) );
 		}
 	}
diff --git a/twin/killwindow.cpp b/twin/killwindow.cpp
index fb5486546..7562f2886 100644
--- a/twin/killwindow.cpp
+++ b/twin/killwindow.cpp
@@ -15,6 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "killwindow.h"
 #include <tqcursor.h>
 #include <X11/Xlib.h>
+#include <X11/XKBlib.h>
 #include <X11/keysym.h>
 #include <X11/keysymdef.h>
 #include <X11/cursorfont.h>
@@ -61,7 +62,7 @@ void KillWindow::start()
 
             if (ev.type == KeyPress)    
                 {
-                int kc = XKeycodeToKeysym(tqt_xdisplay(), ev.xkey.keycode, 0);
+                int kc = XkbKeycodeToKeysym(tqt_xdisplay(), ev.xkey.keycode, 0, 0);
                 int mx = 0;
                 int my = 0;
                 return_pressed = (kc == XK_Return) || (kc == XK_space);
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 7bd194f2d..6781e912e 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -40,6 +40,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "group.h"
 #include "rules.h"
 
+#include <X11/XKBlib.h>
 #include <X11/extensions/shape.h>
 #include <X11/keysym.h>
 #include <X11/keysymdef.h>
@@ -2180,7 +2181,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     {
     if ( root != tqt_xrootwin() )
         return FALSE;
-    int kc = XKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0);
+    int kc = XkbKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0, 0);
     int km = ev.state & (ControlMask | Mod1Mask | ShiftMask);
 
     bool is_control = km & ControlMask;