hotfix

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 0263948..1c6e57f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -25,10 +25,12 @@ struct Item {
 /* static */
 
 static char text[4096];
 /* static */
 
 static char text[4096];

+static char *prompt = NULL;

 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 promptw = 0;

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


@@ -45,7 +47,7 @@ calcoffsets(void) {
 
        if(!curr)
                return;
 
        if(!curr)
                return;

-       w = cmdw + 2 * SPACE;
+       w = promptw + cmdw + 2 * SPACE;

        for(next = curr; next; next=next->right) {
                tw = textw(next->text);
                if(tw > mw / 3)
        for(next = curr; next; next=next->right) {
                tw = textw(next->text);
                if(tw > mw / 3)


@@ -54,7 +56,7 @@ calcoffsets(void) {
                if(w > mw)
                        break;
        }
                if(w > mw)
                        break;
        }

-       w = cmdw + 2 * SPACE;
+       w = promptw + cmdw + 2 * SPACE;

        for(prev = curr; prev && prev->left; prev=prev->left) {
                tw = textw(prev->left->text);
                if(tw > mw / 3)
        for(prev = curr; prev && prev->left; prev=prev->left) {
                tw = textw(prev->left->text);
                if(tw > mw / 3)


@@ -74,6 +76,13 @@ drawmenu(void) {
        dc.w = mw;
        dc.h = mh;
        drawtext(NULL, dc.norm);
        dc.w = mw;
        dc.h = mh;
        drawtext(NULL, dc.norm);

+       /* print prompt? */
+       if(promptw) {
+               dc.w = promptw;
+               drawtext(prompt, dc.sel);
+       }
+       dc.x += promptw;
+       dc.w = mw - promptw;

        /* print command */
        if(cmdw && item)
                dc.w = cmdw;
        /* print command */
        if(cmdw && item)
                dc.w = cmdw;


@@ -169,6 +178,29 @@ kpress(XKeyEvent * e) {
                        break;
                }
        }
                        break;
                }
        }

+       if(e->state & Mod1Mask) {
+               switch(ksym) {
+               default: return;
+               case XK_h:
+                       ksym = XK_Left;
+                       break;
+               case XK_l:
+                       ksym = XK_Right;
+                       break;
+               case XK_j:
+                       ksym = XK_Next;
+                       break;
+               case XK_k:
+                       ksym = XK_Prior;
+                       break;
+               case XK_g:
+                       ksym = XK_Home;
+                       break;
+               case XK_G:
+                       ksym = XK_End;
+                       break;
+               }
+       }

        switch(ksym) {
        default:
                if(num && !iscntrl((int) buf[0])) {
        switch(ksym) {
        default:
                if(num && !iscntrl((int) buf[0])) {


@@ -191,11 +223,13 @@ kpress(XKeyEvent * e) {
                }
                break;
        case XK_End:
                }
                break;
        case XK_End:

+               if(!item)
+                       return;

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

-               while(sel->right)
+               while(sel && sel->right)

                        sel = sel->right;
                break;
        case XK_Escape:
                        sel = sel->right;
                break;
        case XK_Escape:


@@ -203,6 +237,8 @@ kpress(XKeyEvent * e) {
                running = False;
                break;
        case XK_Home:
                running = False;
                break;
        case XK_Home:

+               if(!item)
+                       return;

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


@@ -216,16 +252,16 @@ kpress(XKeyEvent * e) {
                }
                break;
        case XK_Next:
                }
                break;
        case XK_Next:

-               if(next) {
-                       sel = curr = next;
-                       calcoffsets();
-               }
+               if(!next)
+                       return;
+               sel = curr = next;
+               calcoffsets();

                break;
        case XK_Prior:
                break;
        case XK_Prior:

-               if(prev) {
-                       sel = curr = prev;
-                       calcoffsets();
-               }
+               if(!prev)
+                       return;
+               sel = curr = prev;
+               calcoffsets();

                break;
        case XK_Return:
                if((e->state & ShiftMask) && text)
                break;
        case XK_Return:
                if((e->state & ShiftMask) && text)


@@ -326,6 +362,9 @@ main(int argc, char *argv[]) {
                else if(!strncmp(argv[i], "-selfg", 7)) {
                        if(++i < argc) selfg = argv[i];
                }
                else if(!strncmp(argv[i], "-selfg", 7)) {
                        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], "-t", 3)) {
                        if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                }


@@ -334,7 +373,7 @@ main(int argc, char *argv[]) {
                        exit(EXIT_SUCCESS);
                }
                else
                        exit(EXIT_SUCCESS);
                }
                else

-                       eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
+                       eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);

        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)
        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)


@@ -380,6 +419,10 @@ main(int argc, char *argv[]) {
                cmdw = textw(maxname);
        if(cmdw > mw / 3)
                cmdw = mw / 3;
                cmdw = textw(maxname);
        if(cmdw > mw / 3)
                cmdw = mw / 3;

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

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