dito

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 14524c9..561f88f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,13 +24,11 @@ struct Item {
 
 /* static */
 
 
 /* static */
 

-static char *title, text[4096];
+static char text[4096];

 static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
 static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;

-static unsigned int tw = 0;
-static unsigned int cw = 0;

 static Bool done = False;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Bool done = False;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */


@@ -82,18 +80,10 @@ drawmenu()
        drawtext(NULL, False, False);
 
        /* print command */
        drawtext(NULL, False, False);
 
        /* print command */

-       if(!title || text[0]) {
-               cmdw = cw;
-               if(cmdw && item)
-                       dc.w = cmdw;
-               drawtext(text, False, False);
-       }
-       else {
-               cmdw = tw;
+       if(cmdw && item)

                dc.w = cmdw;
                dc.w = cmdw;

-               drawtext(title, False, False);
-       }
-       dc.x += dc.w;
+       drawtext(text[0] ? text : NULL, False, False);
+       dc.x += cmdw;

 
        if(curr) {
                dc.w = SPACE;
 
        if(curr) {
                dc.w = SPACE;


@@ -102,7 +92,6 @@ drawmenu()
 
                /* determine maximum items */
                for(i = curr; i != next; i=i->right) {
 
                /* determine maximum items */
                for(i = curr; i != next; i=i->right) {

-                       dc.border = False;

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


@@ -119,7 +108,7 @@ drawmenu()
 }
 
 static void
 }
 
 static void

-input(char *pattern)
+match(char *pattern)

 {
        unsigned int plen;
        Item *i, *j;
 {
        unsigned int plen;
        Item *i, *j;


@@ -127,11 +116,6 @@ input(char *pattern)
        if(!pattern)
                return;
 
        if(!pattern)
                return;
 

-       if(!title || *pattern)
-               cmdw = cw;
-       else
-               cmdw = tw;
-

        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;
        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;


@@ -193,7 +177,7 @@ kpress(XKeyEvent * e)
                case XK_U:
                case XK_u:
                        text[0] = 0;
                case XK_U:
                case XK_u:
                        text[0] = 0;

-                       input(text);
+                       match(text);

                        drawmenu();
                        return;
                        break;
                        drawmenu();
                        return;
                        break;


@@ -216,7 +200,7 @@ kpress(XKeyEvent * e)
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));

-               input(text);
+               match(text);

                break;
        case XK_Right:
                if(!(sel && sel->right))
                break;
        case XK_Right:
                if(!(sel && sel->right))


@@ -248,9 +232,9 @@ kpress(XKeyEvent * e)
                        prev_nitem = nitem;
                        do {
                                text[--i] = 0;
                        prev_nitem = nitem;
                        do {
                                text[--i] = 0;

-                               input(text);
+                               match(text);

                        } while(i && nitem && prev_nitem == nitem);
                        } while(i && nitem && prev_nitem == nitem);

-                       input(text);
+                       match(text);

                }
                break;
        default:
                }
                break;
        default:


@@ -260,14 +244,14 @@ kpress(XKeyEvent * e)
                                strncat(text, buf, sizeof(text));
                        else
                                strncpy(text, buf, sizeof(text));
                                strncat(text, buf, sizeof(text));
                        else
                                strncpy(text, buf, sizeof(text));

-                       input(text);
+                       match(text);

                }
        }
        drawmenu();
 }
 
 static char *
                }
        }
        drawmenu();
 }
 
 static char *

-readinput()
+readstdin()

 {
        static char *maxname = NULL;
        char *p, buf[1024];
 {
        static char *maxname = NULL;
        char *p, buf[1024];


@@ -308,38 +292,23 @@ int
 main(int argc, char *argv[])
 {
        char *maxname;
 main(int argc, char *argv[])
 {
        char *maxname;

-       int i;

        XEvent ev;
        XSetWindowAttributes wa;
 
        XEvent ev;
        XSetWindowAttributes wa;
 

-       /* command line args */
-       for(i = 1; i < argc; i++) {
-               if (argv[i][0] == '-')
-                       switch (argv[i][1]) {
-                       case 'v':
-                               fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                               exit(EXIT_SUCCESS);
-                               break;
-                       case 't':
-                               if(++i < argc) {
-                                       title = argv[i];
-                                       break;
-                               }
-                       default:
-                               eprint("usage: dmenu [-v] [-t <title>]\n");
-                               break;
-                       }
-               else
-                       eprint("usage: dmenu [-v] [-t <title>]\n");
+       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+               fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               exit(EXIT_SUCCESS);

        }
        }

+       else if(argc != 1)
+               eprint("usage: dmenu [-v]\n");

 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               eprint("dmenu: cannot open dpy\n");
+               eprint("dmenu: cannot open display\n");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 

-       maxname = readinput();
+       maxname = readstdin();

 
        /* grab as early as possible, but after reading all items!!! */
        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
 
        /* grab as early as possible, but after reading all items!!! */
        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,


@@ -371,20 +340,12 @@ main(int argc, char *argv[])
        dc.gc = XCreateGC(dpy, root, 0, 0);
 
        if(maxname)
        dc.gc = XCreateGC(dpy, root, 0, 0);
 
        if(maxname)

-               cw = textw(maxname);
-       if(cw > mw / 3)
-               cw = mw / 3;
-
-       if(title) {
-               tw = textw(title);
-               if(tw > mw / 3)
-                       tw = mw / 3;
-       }
-
-       cmdw = title ? tw : cw;
+               cmdw = textw(maxname);
+       if(cmdw > mw / 3)
+               cmdw = mw / 3;

 
        text[0] = 0;
 
        text[0] = 0;

-       input(text);
+       match(text);

        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);
        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);