summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
Diffstat (limited to 'twin')
-rw-r--r--twin/killwindow.cpp3
-rw-r--r--twin/workspace.cpp3
2 files changed, 4 insertions, 2 deletions
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;