Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
corrections
[dmenu.git] / main.c
diff --git a/main.c b/main.c
index 1d37f70..573d7c3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,17 +1,17 @@
-/* (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"
 
 #include <ctype.h>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
 
 #include <ctype.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/time.h>
-#include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
@@ -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;
@@ -145,7 +154,7 @@ kpress(XKeyEvent * e) {
 
        len = strlen(text);
        buf[0] = 0;
 
        len = strlen(text);
        buf[0] = 0;
-       num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
+       num = XLookupString(e, buf, sizeof buf, &ksym, 0);
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))
@@ -169,7 +178,70 @@ 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) {
        switch(ksym) {
+       default:
+               if(num && !iscntrl((int) buf[0])) {
+                       buf[num] = 0;
+                       if(len > 0)
+                               strncat(text, buf, sizeof text);
+                       else
+                               strncpy(text, buf, sizeof text);
+                       match(text);
+               }
+               break;
+       case XK_BackSpace:
+               if((i = len)) {
+                       prev_nitem = nitem;
+                       do {
+                               text[--i] = 0;
+                               match(text);
+                       } while(i && nitem && prev_nitem == nitem);
+                       match(text);
+               }
+               break;
+       case XK_End:
+               if(!item)
+                       return;
+               while(next) {
+                       sel = curr = next;
+                       calcoffsets();
+               }
+               while(sel && sel->right)
+                       sel = sel->right;
+               break;
+       case XK_Escape:
+               ret = 1;
+               running = False;
+               break;
+       case XK_Home:
+               if(!item)
+                       return;
+               sel = curr = item;
+               calcoffsets();
+               break;
        case XK_Left:
                if(!(sel && sel->left))
                        return;
        case XK_Left:
                if(!(sel && sel->left))
                        return;
@@ -179,20 +251,17 @@ kpress(XKeyEvent * e) {
                        calcoffsets();
                }
                break;
                        calcoffsets();
                }
                break;
-       case XK_Tab:
-               if(!sel)
+       case XK_Next:
+               if(!next)
                        return;
                        return;
-               strncpy(text, sel->text, sizeof(text));
-               match(text);
+               sel = curr = next;
+               calcoffsets();
                break;
                break;
-       case XK_Right:
-               if(!(sel && sel->right))
+       case XK_Prior:
+               if(!prev)
                        return;
                        return;
-               sel=sel->right;
-               if(sel == next) {
-                       curr = next;
-                       calcoffsets();
-               }
+               sel = curr = prev;
+               calcoffsets();
                break;
        case XK_Return:
                if((e->state & ShiftMask) && text)
                break;
        case XK_Return:
                if((e->state & ShiftMask) && text)
@@ -204,29 +273,21 @@ kpress(XKeyEvent * e) {
                fflush(stdout);
                running = False;
                break;
                fflush(stdout);
                running = False;
                break;
-       case XK_Escape:
-               ret = 1;
-               running = False;
-               break;
-       case XK_BackSpace:
-               if((i = len)) {
-                       prev_nitem = nitem;
-                       do {
-                               text[--i] = 0;
-                               match(text);
-                       } while(i && nitem && prev_nitem == nitem);
-                       match(text);
+       case XK_Right:
+               if(!(sel && sel->right))
+                       return;
+               sel=sel->right;
+               if(sel == next) {
+                       curr = next;
+                       calcoffsets();
                }
                break;
                }
                break;
-       default:
-               if(num && !iscntrl((int) buf[0])) {
-                       buf[num] = 0;
-                       if(len > 0)
-                               strncat(text, buf, sizeof(text));
-                       else
-                               strncpy(text, buf, sizeof(text));
-                       match(text);
-               }
+       case XK_Tab:
+               if(!sel)
+                       return;
+               strncpy(text, sel->text, sizeof text);
+               match(text);
+               break;
        }
        drawmenu();
 }
        }
        drawmenu();
 }
@@ -239,7 +300,7 @@ readstdin(void) {
        Item *i, *new;
 
        i = 0;
        Item *i, *new;
 
        i = 0;
-       while(fgets(buf, sizeof(buf), stdin)) {
+       while(fgets(buf, sizeof buf, stdin)) {
                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;
                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;
@@ -269,6 +330,7 @@ DC dc = {0};
 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {
+       Bool bottom = False;
        char *font = FONT;
        char *maxname;
        char *normbg = NORMBGCOLOR;
        char *font = FONT;
        char *maxname;
        char *normbg = NORMBGCOLOR;
@@ -286,30 +348,38 @@ main(int argc, char *argv[]) {
        timeout.tv_sec = 3;
        /* command line args */
        for(i = 1; i < argc; i++)
        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];
                }
                        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];
                }
                        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];
                }
                        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];
                }
                        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], "-t", 3)) {
                        if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                }
                else if(!strncmp(argv[i], "-v", 3)) {
                        if(++i < argc) selfg = 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
                        exit(EXIT_SUCCESS);
                }
                else
-                       eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-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)
                eprint("dmenu: cannot open display\n");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dmenu: cannot open display\n");
@@ -342,11 +412,12 @@ main(int argc, char *argv[]) {
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
        mh = dc.font.height + 2;
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
        mh = dc.font.height + 2;
+       if(bottom)
+               my += DisplayHeight(dpy, screen) - mh;
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
@@ -355,6 +426,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);