commited Connor's sanity patch

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 5f16894..97014cc 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -52,6 +52,7 @@ static void calcoffsetsh(void);
 static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
 static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);

+static void drawcursor(void);

 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);


@@ -117,18 +118,14 @@ calcoffsetsh(void) {
                return;
        w = promptw + cmdw + 2 * spaceitem;
        for(next = curr; next; next=next->right) {
                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) {
                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;
                w += tw;
                if(w > mw)
                        break;


@@ -137,20 +134,20 @@ calcoffsetsh(void) {
 
 void
 calcoffsetsv(void) {
 
 void
 calcoffsetsv(void) {

-       static unsigned int w;
+       static unsigned int h;

 
        if(!curr)
                return;
 
        if(!curr)
                return;

-       w = (dc.font.height + 2) * (lines + 1);
+       h = (dc.font.height + 2) * (lines + 1);

        for(next = curr; next; next=next->right) {
        for(next = curr; next; next=next->right) {

-               w -= dc.font.height + 2;
-               if(w <= 0)
+               h -= dc.font.height + 2;
+               if(h <= 0)

                        break;
        }
                        break;
        }

-       w = (dc.font.height + 2) * (lines + 1);
+       h = (dc.font.height + 2) * (lines + 1);

        for(prev = curr; prev && prev->left; prev=prev->left) {
        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;
        }
 }
                        break;
        }
 }


@@ -247,9 +244,7 @@ drawmenuh(void) {
        dc.x += dc.w;
        /* determine maximum items */
        for(i = curr; i != next; i=i->right) {
        dc.x += dc.w;
        /* determine maximum items */
        for(i = curr; i != next; i=i->right) {

-               dc.w = textw(i->text);
-               if(dc.w > mw / 3)
-                       dc.w = mw / 3;
+               dc.w = MIN(textw(i->text), mw / 3);

                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.x += dc.w;
        }
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.x += dc.w;
        }


@@ -353,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++) {
                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++;
                }
        }
                        xfonts++;
                }
        }


@@ -395,9 +388,18 @@ kpress(XKeyEvent * e) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;

-               case XK_bracketleft:
+               case XK_a:
+               case XK_A:
+                       ksym = XK_Home;
+                       break;
+               case XK_c:
+               case XK_C:

                        ksym = XK_Escape;
                        break;
                        ksym = XK_Escape;
                        break;

+               case XK_e:
+               case XK_E:
+                       ksym = XK_End;
+                       break;

                case XK_h:
                case XK_H:
                        ksym = XK_BackSpace;
                case XK_h:
                case XK_H:
                        ksym = XK_BackSpace;


@@ -414,18 +416,16 @@ kpress(XKeyEvent * e) {
                case XK_U:
                        text[0] = 0;
                        match(text);
                case XK_U:
                        text[0] = 0;
                        match(text);

-                       drawmenu();

                        break;
                case XK_w:
                case XK_W:
                        break;
                case XK_w:
                case XK_W:

-                       if(len) {
-                               i = len - 1;
-                               while(i >= 0 && text[i] == ' ')
-                                       text[i--] = 0;
-                               while(i >= 0 && text[i] != ' ')
-                                       text[i--] = 0;
+                       if(cursor > 0) {
+                               i = cursor;
+                               while(i-- > 0 && text[i] == ' ');
+                               while(i-- > 0 && text[i] != ' ');
+                               memmove(text + i + 1, text + cursor, sizeof text - cursor + 1);
+                               cursor = i + 1;

                                match(text);
                                match(text);

-                               drawmenu();

                        }
                        break;
                }
                        }
                        break;
                }


@@ -454,12 +454,12 @@ kpress(XKeyEvent * e) {
                case XK_p:
                        {
                                FILE *fp;
                case XK_p:
                        {
                                FILE *fp;

-                               char *c;
+                               char *s;

                                if(!(fp = (FILE*)popen("sselp", "r")))
                                        eprint("dmenu: Could not popen sselp\n");
                                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);
                                pclose(fp);

-                               if(c == NULL)
+                               if(s == NULL)

                                        return;
                        }
                        num = strlen(buf);
                                        return;
                        }
                        num = strlen(buf);


@@ -473,14 +473,14 @@ kpress(XKeyEvent * e) {
                num = MIN(num, sizeof text - cursor);
                if(num && !iscntrl((int) buf[0])) {
                        memmove(text + cursor + num, text + cursor, sizeof text - cursor - num);
                num = MIN(num, sizeof text - cursor);
                if(num && !iscntrl((int) buf[0])) {
                        memmove(text + cursor + num, text + cursor, sizeof text - cursor - num);

-                       memmove(text + cursor, buf, num);
+                       memcpy(text + cursor, buf, num);

                        cursor+=num;
                        match(text);
                }
                break;
        case XK_BackSpace:
                if(cursor > 0) {
                        cursor+=num;
                        match(text);
                }
                break;
        case XK_BackSpace:
                if(cursor > 0) {

-                       memmove(text + cursor + -1, text + cursor, sizeof text - cursor);
+                       memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1);

                        cursor--;
                        match(text);
                }
                        cursor--;
                        match(text);
                }


@@ -490,8 +490,10 @@ kpress(XKeyEvent * e) {
                match(text);
                break;
        case XK_End:
                match(text);
                break;
        case XK_End:

-               if(!item)
-                       return;
+               if(cursor < len) {
+                       cursor = len;
+                       break;
+               }

                while(next) {
                        sel = curr = next;
                        calcoffsets();
                while(next) {
                        sel = curr = next;
                        calcoffsets();


@@ -504,8 +506,10 @@ kpress(XKeyEvent * e) {
                running = False;
                break;
        case XK_Home:
                running = False;
                break;
        case XK_Home:

-               if(!item)
-                       return;
+               if(sel == item) {
+                       cursor = 0;
+                       break;
+               }

                sel = curr = item;
                calcoffsets();
                break;
                sel = curr = item;
                calcoffsets();
                break;


@@ -536,12 +540,10 @@ kpress(XKeyEvent * e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:

-               if((e->state & ShiftMask) && *text)
+               if((e->state & ShiftMask) || !sel)

                        fprintf(stdout, "%s", text);
                        fprintf(stdout, "%s", text);

-               else if(sel)
+               else

                        fprintf(stdout, "%s", sel->text);
                        fprintf(stdout, "%s", sel->text);

-               else if(*text)
-                       fprintf(stdout, "%s", text);

                fflush(stdout);
                running = False;
                break;
                fflush(stdout);
                running = False;
                break;


@@ -567,9 +569,6 @@ kpress(XKeyEvent * e) {
                match(text);
                break;
        }
                match(text);
                break;
        }

-       len = strlen(text);
-       cursor = MIN(cursor, len);
-       cursor = MAX(cursor, 0);

        drawmenu();
 }
 
        drawmenu();
 }
 


@@ -616,17 +615,17 @@ match(char *pattern) {
 
 void
 readstdin(void) {
 
 void
 readstdin(void) {

-       char *p, buf[1024];
+       char *p, buf[sizeof text];

        unsigned int len = 0, max = 0;
        Item *i, *new;
 
        unsigned int len = 0, max = 0;
        Item *i, *new;
 

-       i = 0;
+       i = NULL;

        while(fgets(buf, sizeof buf, stdin)) {
                len = strlen(buf);
        while(fgets(buf, sizeof buf, stdin)) {
                len = strlen(buf);

-               if (buf[len - 1] == '\n')
-                       buf[len - 1] = 0;
+               if(buf[len-1] == '\n')
+                       buf[--len] = '\0';

                if(!(p = strdup(buf)))
                if(!(p = strdup(buf)))

-                       eprint("fatal: could not strdup() %u bytes\n", strlen(buf));
+                       eprint("fatal: could not strdup() %u bytes\n", len);

                if(max < len) {
                        maxname = p;
                        max = len;
                if(max < len) {
                        maxname = p;
                        max = len;


@@ -734,13 +733,9 @@ setup(Bool topbar) {
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        if(maxname)
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        if(maxname)

-               cmdw = textw(maxname);
-       if(cmdw > mw / 3)
-               cmdw = mw / 3;
+               cmdw = MIN(textw(maxname), mw / 3);

        if(prompt)
        if(prompt)

-               promptw = textw(prompt);
-       if(promptw > mw / 5)
-               promptw = mw / 5;
+               promptw = MIN(textw(prompt), mw / 5);

        text[0] = 0;
        match(text);
        XMapRaised(dpy, win);
        text[0] = 0;
        match(text);
        XMapRaised(dpy, win);


@@ -775,6 +770,9 @@ main(int argc, char *argv[]) {
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;

+               else if(!strcmp(argv[i], "-e")) {
+                       if(++i < argc) root = atoi(argv[i]);
+               }

                else if(!strcmp(argv[i], "-l")) {
                        vlist = True;
                        calcoffsets = calcoffsetsv;
                else if(!strcmp(argv[i], "-l")) {
                        vlist = True;
                        calcoffsets = calcoffsetsv;


@@ -799,25 +797,20 @@ main(int argc, char *argv[]) {
                        if(++i < argc) selfgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-v"))
                        if(++i < argc) selfgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-v"))

-                       eprint("dmenu-"VERSION", © 2006-2009 dmenu engineers, see LICENSE for details\n");
+                       eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");

                else
                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)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);

-       root = RootWindow(dpy, screen);
+       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();
 
        setup(topbar);
        drawmenu();