happy new year!

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index d0e27da..6f6123d 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 */
@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
        setup();
        run();
 
-       return EXIT_FAILURE; /* unreachable */
+       return 1; /* unreachable */
 }
 
 void
@@ -243,11 +243,8 @@ keypress(XKeyEvent *ev) {
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        if(status == XBufferOverflow)
                return;
-       if(ev->state & ControlMask) {
-               KeySym lower, upper;
-
-               XConvertCase(ksym, &lower, &upper);
-               switch(lower) {
+       if(ev->state & ControlMask)
+               switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                case XK_c: ksym = XK_Escape;    break;
@@ -281,7 +278,17 @@ keypress(XKeyEvent *ev) {
                default:
                        return;
                }
-       }
+       else if(ev->state & Mod1Mask)
+               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;
+               default:
+                       return;
+               }
        switch(ksym) {
        default:
                if(!iscntrl(*buf))
@@ -328,6 +335,8 @@ keypress(XKeyEvent *ev) {
                        cursor = nextrune(-1);
                        break;
                }
+               if(lines > 0)
+                       return;
                /* fallthrough */
        case XK_Up:
                if(sel && sel->left && (sel = sel->left)->right == curr) {
@@ -356,6 +365,8 @@ keypress(XKeyEvent *ev) {
                        cursor = nextrune(+1);
                        break;
                }
+               if(lines > 0)
+                       return;
                /* fallthrough */
        case XK_Down:
                if(sel && sel->right && (sel = sel->right) == next) {
@@ -571,12 +582,12 @@ setup(void) {
 
        /* create menu window */
        swa.override_redirect = True;
-       swa.background_pixmap = ParentRelative;
+       swa.background_pixel = normcol[ColBG];
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),
-                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
+                           CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
        /* open input methods */
        xim = XOpenIM(dc->dpy, NULL, NULL, NULL);