nsxiv1a18523
fix: reset statusbar after failed keyhandler (#191)
currently if the keyhandler invocation fails, for example due to it not being present, the statusbar does not reset and stays on "getting keyhandler input" message. now the return value from run_key_handler() is used to determine if the function was successful or not. and if the function failed, we call handle_key_handler() with false which resets the statusbar. we also no longer call redraw() within run_key_handler() and instead assign it's return value to dirty which does a redraw if true.
+10 −8
1 file changed
- M main.c +10 −8
| @@ -507,7 +507,7 @@ void handle_key_handler(bool init) | |||
| 507 | 507 | win_draw(&win); | |
| 508 | 508 | } | |
| 509 | 509 | ||
| 510 | − | static void run_key_handler(const char *key, unsigned int mask) | |
| 510 | + | static bool run_key_handler(const char *key, unsigned int mask) | |
| 511 | 511 | { | |
| 512 | 512 | pid_t pid; | |
| 513 | 513 | FILE *pfs; | |
| @@ -524,19 +524,19 @@ static void run_key_handler(const char *key, unsigned int mask) | |||
| 524 | 524 | error(0, keyhandler.f.err, "%s", keyhandler.f.cmd); | |
| 525 | 525 | keyhandler.warned = true; | |
| 526 | 526 | } | |
| 527 | − | return; | |
| 527 | + | return false; | |
| 528 | 528 | } | |
| 529 | 529 | if (key == NULL) | |
| 530 | − | return; | |
| 530 | + | return false; | |
| 531 | 531 | ||
| 532 | 532 | if (pipe(pfd) < 0) { | |
| 533 | 533 | error(0, errno, "pipe"); | |
| 534 | − | return; | |
| 534 | + | return false; | |
| 535 | 535 | } | |
| 536 | 536 | if ((pfs = fdopen(pfd[1], "w")) == NULL) { | |
| 537 | 537 | error(0, errno, "open pipe"); | |
| 538 | 538 | close(pfd[0]), close(pfd[1]); | |
| 539 | − | return; | |
| 539 | + | return false; | |
| 540 | 540 | } | |
| 541 | 541 | oldst = emalloc(fcnt * sizeof(*oldst)); | |
| 542 | 542 | ||
| @@ -602,7 +602,7 @@ end: | |||
| 602 | 602 | } | |
| 603 | 603 | free(oldst); | |
| 604 | 604 | reset_cursor(); | |
| 605 | − | redraw(); | |
| 605 | + | return true; | |
| 606 | 606 | } | |
| 607 | 607 | ||
| 608 | 608 | static bool process_bindings(const keymap_t *keys, unsigned int len, KeySym ksym_or_button, | |
| @@ -645,8 +645,10 @@ static void on_keypress(XKeyEvent *kev) | |||
| 645 | 645 | if (extprefix && ksym == KEYHANDLER_ABORT && MODMASK(kev->state) == 0) { | |
| 646 | 646 | handle_key_handler(false); | |
| 647 | 647 | } else if (extprefix) { | |
| 648 | − | run_key_handler(XKeysymToString(ksym), kev->state & ~sh); | |
| 649 | − | extprefix = false; | |
| 648 | + | if ((dirty = run_key_handler(XKeysymToString(ksym), kev->state & ~sh))) | |
| 649 | + | extprefix = false; | |
| 650 | + | else | |
| 651 | + | handle_key_handler(false); | |
| 650 | 652 | } else if (key >= '0' && key <= '9') { | |
| 651 | 653 | /* number prefix for commands */ | |
| 652 | 654 | prefix = prefix * 10 + (int) (key - '0'); | |