xduplic-copier: Use XkbKeycodeToKeysym instead of XKeycodeToKeysym.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cprogs/xduplic-copier.c b/cprogs/xduplic-copier.c
index 7118d951a9d8444f121979b55b9b8d1e8bbda211..d9703a55e72ed42fb2c51c7ae0a7da054deeda22 100644 (file)
--- a/cprogs/xduplic-copier.c
+++ b/cprogs/xduplic-copier.c
@@ -20,6 +20,7 @@
 #include <X11/cursorfont.h>
 #include <X11/cursorfont.h>
 #include <X11/Xmu/WinUtil.h>
+#include <X11/XKBlib.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -202,7 +203,7 @@ static void keypress(XKeyEvent *e) {
            (unsigned long)e->time,
            e->x,e->y, e->x_root,e->y_root,
            e->state, e->keycode, (int)e->same_screen);
-    if (XKeycodeToKeysym(display, e->keycode, 0) == XK_q) _exit(1);
+    if (XkbKeycodeToKeysym(display, e->keycode, 0, 0) == XK_q) _exit(1);
     beep(); return;
   }
   for (own=headwn; own; own=own->next) {

diff --git a/debian/changelog b/debian/changelog
index bdbe1596d1d0a7e43ac13949ec44575e551a0097..721a4ef6625df638096de3bdd9de8e91f3180edd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ chiark-utils (4.5.0~iwj5) unstable; urgency=medium
   * xduplic-copier: Drop obsolete variable "ts_last".
   * xduplic-copier: Print error message, rather than segfaulting,
     if XOpenDisplay fails.
+  * xduplic-copier: Use XkbKeycodeToKeysym instead of XKeycodeToKeysym.
 
   debian/rules file tidying:
   * Drop seddery for libgmp3c2 C++ ABI transition.