diff options
| -rw-r--r-- | main.c | 18 |
1 files changed, 9 insertions, 9 deletions
| @@ -109,7 +109,7 @@ drawmenu() | |||
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static void | 111 | static void |
| 112 | input(char *pattern) | 112 | match(char *pattern) |
| 113 | { | 113 | { |
| 114 | unsigned int plen; | 114 | unsigned int plen; |
| 115 | Item *i, *j; | 115 | Item *i, *j; |
| @@ -178,7 +178,7 @@ kpress(XKeyEvent * e) | |||
| 178 | case XK_U: | 178 | case XK_U: |
| 179 | case XK_u: | 179 | case XK_u: |
| 180 | text[0] = 0; | 180 | text[0] = 0; |
| 181 | input(text); | 181 | match(text); |
| 182 | drawmenu(); | 182 | drawmenu(); |
| 183 | return; | 183 | return; |
| 184 | break; | 184 | break; |
| @@ -201,7 +201,7 @@ kpress(XKeyEvent * e) | |||
| 201 | if(!sel) | 201 | if(!sel) |
| 202 | return; | 202 | return; |
| 203 | strncpy(text, sel->text, sizeof(text)); | 203 | strncpy(text, sel->text, sizeof(text)); |
| 204 | input(text); | 204 | match(text); |
| 205 | break; | 205 | break; |
| 206 | case XK_Right: | 206 | case XK_Right: |
| 207 | if(!(sel && sel->right)) | 207 | if(!(sel && sel->right)) |
| @@ -233,9 +233,9 @@ kpress(XKeyEvent * e) | |||
| 233 | prev_nitem = nitem; | 233 | prev_nitem = nitem; |
| 234 | do { | 234 | do { |
| 235 | text[--i] = 0; | 235 | text[--i] = 0; |
| 236 | input(text); | 236 | match(text); |
| 237 | } while(i && nitem && prev_nitem == nitem); | 237 | } while(i && nitem && prev_nitem == nitem); |
| 238 | input(text); | 238 | match(text); |
| 239 | } | 239 | } |
| 240 | break; | 240 | break; |
| 241 | default: | 241 | default: |
| @@ -245,14 +245,14 @@ kpress(XKeyEvent * e) | |||
| 245 | strncat(text, buf, sizeof(text)); | 245 | strncat(text, buf, sizeof(text)); |
| 246 | else | 246 | else |
| 247 | strncpy(text, buf, sizeof(text)); | 247 | strncpy(text, buf, sizeof(text)); |
| 248 | input(text); | 248 | match(text); |
| 249 | } | 249 | } |
| 250 | } | 250 | } |
| 251 | drawmenu(); | 251 | drawmenu(); |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | static char * | 254 | static char * |
| 255 | readinput() | 255 | readstdin() |
| 256 | { | 256 | { |
| 257 | static char *maxname = NULL; | 257 | static char *maxname = NULL; |
| 258 | char *p, buf[1024]; | 258 | char *p, buf[1024]; |
| @@ -309,7 +309,7 @@ main(int argc, char *argv[]) | |||
| 309 | screen = DefaultScreen(dpy); | 309 | screen = DefaultScreen(dpy); |
| 310 | root = RootWindow(dpy, screen); | 310 | root = RootWindow(dpy, screen); |
| 311 | 311 | ||
| 312 | maxname = readinput(); | 312 | maxname = readstdin(); |
| 313 | 313 | ||
| 314 | /* grab as early as possible, but after reading all items!!! */ | 314 | /* grab as early as possible, but after reading all items!!! */ |
| 315 | while(XGrabKeyboard(dpy, root, True, GrabModeAsync, | 315 | while(XGrabKeyboard(dpy, root, True, GrabModeAsync, |
| @@ -346,7 +346,7 @@ main(int argc, char *argv[]) | |||
| 346 | cmdw = mw / 3; | 346 | cmdw = mw / 3; |
| 347 | 347 | ||
| 348 | text[0] = 0; | 348 | text[0] = 0; |
| 349 | input(text); | 349 | match(text); |
| 350 | XMapRaised(dpy, win); | 350 | XMapRaised(dpy, win); |
| 351 | drawmenu(); | 351 | drawmenu(); |
| 352 | XSync(dpy, False); | 352 | XSync(dpy, False); |
