From dc5abfc65426d4b466cd69b5fceeffb53779afd8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Nov 2016 13:30:50 +0000 Subject: [PATCH] xduplic-copier: Use XkbKeycodeToKeysym instead of XKeycodeToKeysym. Signed-off-by: Ian Jackson --- cprogs/xduplic-copier.c | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cprogs/xduplic-copier.c b/cprogs/xduplic-copier.c index 7118d95..d9703a5 100644 --- a/cprogs/xduplic-copier.c +++ b/cprogs/xduplic-copier.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -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 bdbe159..721a4ef 100644 --- 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. -- 2.30.2