_POSIX_C_SOURCE=200809L

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 9fa3e3c0c366cb1d629fb1a0236d6623f23738dd..f7eba87c4af78ffaacca898199b2906b43a653f4 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -72,7 +72,7 @@ main(int argc, char *argv[]) {
        for(i = 1; i < argc; i++)
                /* these options take no arguments */
                if(!strcmp(argv[i], "-v")) {      /* prints version information */
-                       puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+                       puts("dmenu-"VERSION", © 2006-2012 dmenu engineers, see LICENSE for details");
                        exit(EXIT_SUCCESS);
                }
                else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
@@ -251,10 +251,13 @@ keypress(XKeyEvent *ev) {
                case XK_d: ksym = XK_Delete;    break;
                case XK_e: ksym = XK_End;       break;
                case XK_f: ksym = XK_Right;     break;
+               case XK_g: ksym = XK_Escape;    break;
                case XK_h: ksym = XK_BackSpace; break;
                case XK_i: ksym = XK_Tab;       break;
-               case XK_j: ksym = XK_Return;    break;
-               case XK_m: ksym = XK_Return;    break;
+               case XK_j: /* fallthrough */
+               case XK_J: ksym = XK_Return;    break;
+               case XK_m: /* fallthrough */
+               case XK_M: ksym = XK_Return;    break;
                case XK_n: ksym = XK_Down;      break;
                case XK_p: ksym = XK_Up;        break;
 
@@ -282,10 +285,10 @@ keypress(XKeyEvent *ev) {
                switch(ksym) {
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
-               case XK_h: ksym = XK_Prior; break;
-               case XK_j: ksym = XK_Up;    break;
-               case XK_k: ksym = XK_Down;  break;
-               case XK_l: ksym = XK_Next;  break;
+               case XK_h: ksym = XK_Up;    break;
+               case XK_j: ksym = XK_Next;  break;
+               case XK_k: ksym = XK_Prior; break;
+               case XK_l: ksym = XK_Down;  break;
                default:
                        return;
                }