From 443169bdcb47dfecf18da981119342b9f19eb84f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Aug 2012 15:24:47 -0500 Subject: Update calls to deprecated XKeycodeToKeysym function --- twin/killwindow.cpp | 3 ++- twin/workspace.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'twin') 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 #include +#include #include #include #include @@ -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 #include #include #include @@ -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; -- cgit v1.2.1