nsxiv0262988
rename: keyhandler_abort -> KEYHANDLER_ABORT (#172)
with the exception of arrays, all other var names in config.h are in ALL CAPS. since keyhandler_abort is an unreleased feature, it should be okay to rename it for consistency. though.. in the future we should be more careful about naming when adding new vars to config.h (or the codebase in general.)
+3 −3
2 files changed
- M config.def.h +1 −1
- M main.c +2 −2
| @@ -75,7 +75,7 @@ static const int THUMB_SIZE = 3; | |||
| 75 | 75 | static const int ignore_mask = Mod2Mask | LockMask; | |
| 76 | 76 | ||
| 77 | 77 | /* abort the keyhandler */ | |
| 78 | − | static const KeySym keyhandler_abort = XK_Escape; | |
| 78 | + | static const KeySym KEYHANDLER_ABORT = XK_Escape; | |
| 79 | 79 | ||
| 80 | 80 | /* keyboard mappings for image and thumbnail mode: */ | |
| 81 | 81 | static const keymap_t keys[] = { | |
| @@ -499,7 +499,7 @@ void handle_key_handler(bool init) | |||
| 499 | 499 | if (init) { | |
| 500 | 500 | close_info(); | |
| 501 | 501 | snprintf(win.bar.l.buf, win.bar.l.size, "Getting key handler input " | |
| 502 | − | "(%s to abort)...", XKeysymToString(keyhandler_abort)); | |
| 502 | + | "(%s to abort)...", XKeysymToString(KEYHANDLER_ABORT)); | |
| 503 | 503 | } else { /* abort */ | |
| 504 | 504 | open_info(); | |
| 505 | 505 | update_info(); | |
| @@ -642,7 +642,7 @@ static void on_keypress(XKeyEvent *kev) | |||
| 642 | 642 | } | |
| 643 | 643 | if (IsModifierKey(ksym)) | |
| 644 | 644 | return; | |
| 645 | − | if (extprefix && ksym == keyhandler_abort && MODMASK(kev->state) == 0) { | |
| 645 | + | if (extprefix && ksym == KEYHANDLER_ABORT && MODMASK(kev->state) == 0) { | |
| 646 | 646 | handle_key_handler(false); | |
| 647 | 647 | } else if (extprefix) { | |
| 648 | 648 | run_key_handler(XKeysymToString(ksym), kev->state & ~sh); | |