renamed some functions to make it more readable
arg@10ksloc.org unknown
Mon, 07 Aug 2006 07:39:31 +0200
1 files changed,
9 insertions(+),
9 deletions(-)
jump to
M
main.c
→
main.c
@@ -109,7 +109,7 @@ XFlush(dpy);
} static void -input(char *pattern) +match(char *pattern) { unsigned int plen; Item *i, *j;@@ -178,7 +178,7 @@ break;
case XK_U: case XK_u: text[0] = 0; - input(text); + match(text); drawmenu(); return; break;@@ -201,7 +201,7 @@ case XK_Tab:
if(!sel) return; strncpy(text, sel->text, sizeof(text)); - input(text); + match(text); break; case XK_Right: if(!(sel && sel->right))@@ -233,9 +233,9 @@ if((i = len)) {
prev_nitem = nitem; do { text[--i] = 0; - input(text); + match(text); } while(i && nitem && prev_nitem == nitem); - input(text); + match(text); } break; default:@@ -245,14 +245,14 @@ if(len > 0)
strncat(text, buf, sizeof(text)); else strncpy(text, buf, sizeof(text)); - input(text); + match(text); } } drawmenu(); } static char * -readinput() +readstdin() { static char *maxname = NULL; char *p, buf[1024];@@ -309,7 +309,7 @@ eprint("dmenu: cannot open display\n");
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,@@ -346,7 +346,7 @@ if(cmdw > mw / 3)
cmdw = mw / 3; text[0] = 0; - input(text); + match(text); XMapRaised(dpy, win); drawmenu(); XSync(dpy, False);