]> git.cworth.org Git - acre/commitdiff
acre-x: Allow Escape key to quit
authorCarl Worth <cworth@cworth.org>
Thu, 7 Nov 2013 13:34:11 +0000 (05:34 -0800)
committerCarl Worth <cworth@cworth.org>
Thu, 7 Nov 2013 13:34:11 +0000 (05:34 -0800)
I kept finding myself having trouble quitting because I was hitting
Escape rather than Q. Make the program conform to my expectations.

acre-x.c

index e89c7fcf285f556d1b402a245cd3f43f42f57f1a..f0fac370a5d9bb45e414c7834a6e5e9087805624 100644 (file)
--- a/acre-x.c
+++ b/acre-x.c
@@ -103,6 +103,7 @@ handle_events(Display *dpy, Window window, Visual *visual,
 {
         XEvent xev;
         KeyCode quit_code = XKeysymToKeycode (dpy, XStringToKeysym("Q"));
+        KeyCode escape_code = XKeysymToKeycode (dpy, XStringToKeysym("Escape"));
         KeyCode left_code = XKeysymToKeycode (dpy, XStringToKeysym("Left"));
         KeyCode right_code = XKeysymToKeycode (dpy, XStringToKeysym("Right"));
         KeyCode plus_code = XKeysymToKeycode (dpy, XStringToKeysym("plus"));
@@ -126,7 +127,8 @@ handle_events(Display *dpy, Window window, Visual *visual,
                 switch (xev.type) {
                 case KeyPress:
                        keycode = xev.xkey.keycode;
-                       if (keycode == quit_code)
+                       if (keycode == quit_code ||
+                           keycode == escape_code)
                        {
                                 return;
                        }