nah nah nah, I can't get used to the bottom bar, pushing the conditional dmenu again

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 06b2ca9..f1f71fd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
@@ -15,6 +15,8 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+
 typedef struct Item Item;
 struct Item {
        Item *next;             /* traverses all items */
@@ -26,11 +28,12 @@ struct Item {
 
 static char text[4096];
 static char *prompt = NULL;
-static int mx, my, mw, mh;
+static int mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
 static unsigned int promptw = 0;
+static unsigned int numlockmask = 0;
 static Bool running = True;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
@@ -164,41 +167,50 @@ kpress(XKeyEvent * e) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;
+               case XK_bracketleft:
+                       ksym = XK_Escape;
                        break;
                case XK_h:
                case XK_H:
                        ksym = XK_BackSpace;
                        break;
+               case XK_i:
+               case XK_I:
+                       ksym = XK_Tab;
+                       break;
+               case XK_j:
+               case XK_J:
+                       ksym = XK_Return;
+                       break;
                case XK_u:
                case XK_U:
                        text[0] = 0;
                        match(text);
                        drawmenu();
                        return;
-                       break;
                }
        }
-       if(e->state & Mod1Mask) {
+       if(CLEANMASK(e->state) & Mod1Mask) {
                switch(ksym) {
                default: return;
                case XK_h:
-                        ksym = XK_Left;
-                        break;
+                       ksym = XK_Left;
+                       break;
                case XK_l:
-                        ksym = XK_Right;
-                        break;
+                       ksym = XK_Right;
+                       break;
                case XK_j:
-                        ksym = XK_Next;
-                        break;
-               case XK_l:
-                        ksym = XK_Prior;
-                        break;
+                       ksym = XK_Next;
+                       break;
+               case XK_k:
+                       ksym = XK_Prior;
+                       break;
                case XK_g:
-                        ksym = XK_Home;
-                        break;
+                       ksym = XK_Home;
+                       break;
                case XK_G:
-                        ksym = XK_End;
-                        break;
+                       ksym = XK_End;
+                       break;
                }
        }
        switch(ksym) {
@@ -330,6 +342,7 @@ DC dc = {0};
 
 int
 main(int argc, char *argv[]) {
+       Bool bottom = False;
        char *font = FONT;
        char *maxname;
        char *normbg = NORMBGCOLOR;
@@ -337,43 +350,48 @@ main(int argc, char *argv[]) {
        char *selbg = SELBGCOLOR;
        char *selfg = SELFGCOLOR;
        fd_set rd;
-       int i;
+       int i, j;
        struct timeval timeout;
        Item *itm;
        XEvent ev;
+       XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 
        timeout.tv_usec = 0;
        timeout.tv_sec = 3;
        /* command line args */
        for(i = 1; i < argc; i++)
-               if(!strncmp(argv[i], "-font", 6)) {
+               if(!strncmp(argv[i], "-b", 3)) {
+                       bottom = True;
+               }
+               else if(!strncmp(argv[i], "-fn", 4)) {
                        if(++i < argc) font = argv[i];
                }
-               else if(!strncmp(argv[i], "-normbg", 8)) {
+               else if(!strncmp(argv[i], "-nb", 4)) {
                        if(++i < argc) normbg = argv[i];
                }
-               else if(!strncmp(argv[i], "-normfg", 8)) {
+               else if(!strncmp(argv[i], "-nf", 4)) {
                        if(++i < argc) normfg = argv[i];
                }
-               else if(!strncmp(argv[i], "-selbg", 7)) {
+               else if(!strncmp(argv[i], "-p", 3)) {
+                       if(++i < argc) prompt = argv[i];
+               }
+               else if(!strncmp(argv[i], "-sb", 4)) {
                        if(++i < argc) selbg = argv[i];
                }
-               else if(!strncmp(argv[i], "-selfg", 7)) {
+               else if(!strncmp(argv[i], "-sf", 4)) {
                        if(++i < argc) selfg = argv[i];
                }
-               else if(!strncmp(argv[i], "-p", 3)) {
-                       if(++i < argc) prompt = argv[i];
-               }
                else if(!strncmp(argv[i], "-t", 3)) {
                        if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                }
                else if(!strncmp(argv[i], "-v", 3)) {
-                       fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+                       fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
                        exit(EXIT_SUCCESS);
                }
                else
-                       eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+                       eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
+                               "             [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)
@@ -394,6 +412,15 @@ main(int argc, char *argv[]) {
        if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
                goto UninitializedEnd;
        maxname = readstdin();
+       /* init modifier map */
+       modmap = XGetModifierMapping(dpy);
+       for (i = 0; i < 8; i++) {
+               for (j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       }
+       XFreeModifiermap(modmap);
        /* style */
        dc.norm[ColBG] = getcolor(normbg);
        dc.norm[ColFG] = getcolor(normfg);
@@ -404,10 +431,10 @@ main(int argc, char *argv[]) {
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-       mx = my = 0;
        mw = DisplayWidth(dpy, screen);
        mh = dc.font.height + 2;
-       win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
+       win = XCreateWindow(dpy, root, 0,
+                       bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);