fixed 3 bugs and some inconsistency

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 4c87d6a..15a6152 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -118,18 +118,14 @@ calcoffsetsh(void) {
                return;
        w = promptw + cmdw + 2 * spaceitem;
        for(next = curr; next; next=next->right) {
-               tw = textw(next->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
+               tw = MIN(textw(next->text), mw / 3);
                w += tw;
                if(w > mw)
                        break;
        }
        w = promptw + cmdw + 2 * spaceitem;
        for(prev = curr; prev && prev->left; prev=prev->left) {
-               tw = textw(prev->left->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
+               tw = MIN(textw(prev->left->text), mw / 3);
                w += tw;
                if(w > mw)
                        break;
@@ -138,20 +134,20 @@ calcoffsetsh(void) {
 
 void
 calcoffsetsv(void) {
-       static unsigned int w;
+       static unsigned int h;
 
        if(!curr)
                return;
-       w = (dc.font.height + 2) * (lines + 1);
+       h = (dc.font.height + 2) * (lines + 1);
        for(next = curr; next; next=next->right) {
-               w -= dc.font.height + 2;
-               if(w <= 0)
+               h -= dc.font.height + 2;
+               if(h <= 0)
                        break;
        }
-       w = (dc.font.height + 2) * (lines + 1);
+       h = (dc.font.height + 2) * (lines + 1);
        for(prev = curr; prev && prev->left; prev=prev->left) {
-               w -= dc.font.height + 2;
-               if(w <= 0)
+               h -= dc.font.height + 2;
+               if(h <= 0)
                        break;
        }
 }
@@ -163,12 +159,12 @@ cistrstr(const char *s, const char *sub) {
 
        if(!sub)
                return (char *)s;
-       if((c = *sub++) != 0) {
+       if((c = *sub++) != '\0') {
                c = tolower(c);
                len = strlen(sub);
                do {
                        do {
-                               if((csub = *s++) == 0)
+                               if((csub = *s++) == '\0')
                                        return NULL;
                        }
                        while(tolower(csub) != c);
@@ -224,7 +220,7 @@ drawmenu(void) {
        dc.x += promptw;
        dc.w = mw - promptw;
        /* print command */
-       if(cmdw && item)
+       if(cmdw && item && !vlist)
                dc.w = cmdw;
        drawtext(text[0] ? text : NULL, dc.norm);
        drawcursor();
@@ -352,10 +348,8 @@ initfont(const char *fontstr) {
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
+                       dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+                       dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
                        xfonts++;
                }
        }
@@ -377,7 +371,7 @@ kpress(XKeyEvent * e) {
        KeySym ksym;
 
        len = strlen(text);
-       buf[0] = 0;
+       buf[0] = '\0';
        num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
        if(IsKeypadKey(ksym)) {
                if(ksym == XK_KP_Enter)
@@ -396,16 +390,16 @@ kpress(XKeyEvent * e) {
                        return;
                case XK_a:
                case XK_A:
-                       cursor = 0;
-                       break;
-               case XK_e:
-               case XK_E:
-                       cursor = strlen(text);
+                       ksym = XK_Home;
                        break;
                case XK_c:
                case XK_C:
                        ksym = XK_Escape;
                        break;
+               case XK_e:
+               case XK_E:
+                       ksym = XK_End;
+                       break;
                case XK_h:
                case XK_H:
                        ksym = XK_BackSpace;
@@ -420,7 +414,8 @@ kpress(XKeyEvent * e) {
                        break;
                case XK_u:
                case XK_U:
-                       text[0] = 0;
+                       cursor = 0;
+                       text[0] = '\0';
                        match(text);
                        break;
                case XK_w:
@@ -429,7 +424,7 @@ kpress(XKeyEvent * e) {
                                i = cursor;
                                while(i-- > 0 && text[i] == ' ');
                                while(i-- > 0 && text[i] != ' ');
-                               memmove(text + i + 1, text + cursor, sizeof text - cursor);
+                               memmove(text + i + 1, text + cursor, sizeof text - cursor + 1);
                                cursor = i + 1;
                                match(text);
                        }
@@ -460,12 +455,12 @@ kpress(XKeyEvent * e) {
                case XK_p:
                        {
                                FILE *fp;
-                               char *c;
+                               char *s;
                                if(!(fp = (FILE*)popen("sselp", "r")))
                                        eprint("dmenu: Could not popen sselp\n");
-                               c = fgets(buf, sizeof buf, fp);
+                               s = fgets(buf, sizeof buf, fp);
                                pclose(fp);
-                               if(c == NULL)
+                               if(s == NULL)
                                        return;
                        }
                        num = strlen(buf);
@@ -621,7 +616,7 @@ match(char *pattern) {
 
 void
 readstdin(void) {
-       char *p, buf[1024];
+       char *p, buf[sizeof text];
        unsigned int len = 0, max = 0;
        Item *i, *new;
 
@@ -632,7 +627,7 @@ readstdin(void) {
                        buf[--len] = '\0';
                if(!(p = strdup(buf)))
                        eprint("fatal: could not strdup() %u bytes\n", len);
-               if(max < len) {
+               if(max < len || !maxname) {
                        maxname = p;
                        max = len;
                }
@@ -664,6 +659,10 @@ run(void) {
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
+               case VisibilityNotify:
+                       if (ev.xvisibility.state != VisibilityUnobscured)
+                               XRaiseWindow(dpy, win);
+                       break;
                }
 }
 
@@ -697,7 +696,7 @@ setup(Bool topbar) {
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
+       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
 
        /* menu window geometry */
        mh = dc.font.height + 2;
@@ -742,7 +741,7 @@ setup(Bool topbar) {
                cmdw = MIN(textw(maxname), mw / 3);
        if(prompt)
                promptw = MIN(textw(prompt), mw / 5);
-       text[0] = 0;
+       text[0] = '\0';
        match(text);
        XMapRaised(dpy, win);
 }
@@ -805,8 +804,8 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-v"))
                        eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
                else
-                       eprint("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                              "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+                       eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
@@ -815,14 +814,8 @@ main(int argc, char *argv[]) {
        if(!root)
                root = RootWindow(dpy, screen);
 
-       if(isatty(STDIN_FILENO)) {
-               readstdin();
-               running = grabkeyboard();
-       }
-       else { /* prevent keypress loss */
-               running = grabkeyboard();
-               readstdin();
-       }
+       readstdin();
+       running = grabkeyboard();
 
        setup(topbar);
        drawmenu();