nsxiv54d7b7f
Use a prefix key to execute the key handler
The default prefix key is C-x, and can be changed in config.def.h. The first key pressed after the prefix key will be passed the external key handler, unless the key is Escape, which is used to cancel the prefix.
+25 −5
4 files changed
- M README.md +4 −0
- M config.def.h +6 −0
- M exec/key-handler +3 −3
- M main.c +12 −2
| @@ -113,6 +113,10 @@ of small previews is displayed, making it easy to choose an image to open. | |||
| 113 | 113 | N Go [count] marked images forward | |
| 114 | 114 | P Go [count] marked images backward | |
| 115 | 115 | ||
| 116 | + | Ctrl-x KEY Execute $XDG_CONFIG_HOME/sxiv/exec/key-handler with | |
| 117 | + | KEY and the path of the current image as arguments. | |
| 118 | + | If KEY is Escape, it cancels the effect of Ctrl-x. | |
| 119 | + | ||
| 116 | 120 | *Thumbnail mode:* | |
| 117 | 121 | ||
| 118 | 122 | h,j,k,l Move selection left/down/up/right [count] times | |
| @@ -77,6 +77,12 @@ static const bool RENDER_WHITE_ALPHA = false; | |||
| 77 | 77 | #endif | |
| 78 | 78 | #ifdef _MAPPINGS_CONFIG | |
| 79 | 79 | ||
| 80 | + | /* the prefix key: when pressed, the next key combo is passed to the external | |
| 81 | + | * key handler | |
| 82 | + | */ | |
| 83 | + | #define PREFIX_KEYMASK ControlMask | |
| 84 | + | #define PREFIX_KEYSYM XK_x | |
| 85 | + | ||
| 80 | 86 | /* keyboard mappings for image and thumbnail mode: */ | |
| 81 | 87 | static const keymap_t keys[] = { | |
| 82 | 88 | /* modifiers key function argument */ | |
| @@ -1,9 +1,9 @@ | |||
| 1 | 1 | #!/bin/sh | |
| 2 | 2 | ||
| 3 | 3 | # Example for $XDG_CONFIG_HOME/sxiv/exec/key-handler | |
| 4 | − | # Called by sxiv(1) whenever an unbound key combo is used, | |
| 5 | − | # with the key combo as its first argument and the path of the current image | |
| 6 | − | # as its second argument. | |
| 4 | + | # Called by sxiv(1) when you press the prefix key (C-x by default) followed by | |
| 5 | + | # a key combo. The key combo is passed as its first argument and the path of | |
| 6 | + | # the current image as its second argument. | |
| 7 | 7 | # sxiv(1) blocks until this script terminates. It then checks if the image | |
| 8 | 8 | # has been modified and reloads it. | |
| 9 | 9 | ||
| @@ -504,6 +504,7 @@ void run_key_handler(const char *key, unsigned int mask) | |||
| 504 | 504 | ||
| 505 | 505 | void on_keypress(XKeyEvent *kev) | |
| 506 | 506 | { | |
| 507 | + | static bool seen_prefix_key = false; | |
| 507 | 508 | int i; | |
| 508 | 509 | unsigned int sh; | |
| 509 | 510 | KeySym ksym, shksym; | |
| @@ -523,6 +524,17 @@ void on_keypress(XKeyEvent *kev) | |||
| 523 | 524 | if (IsModifierKey(ksym)) | |
| 524 | 525 | return; | |
| 525 | 526 | ||
| 527 | + | if (seen_prefix_key) { | |
| 528 | + | seen_prefix_key = false; | |
| 529 | + | if (!(MODMASK(kev->state) == 0 && ksym == XK_Escape)) | |
| 530 | + | run_key_handler(XKeysymToString(ksym), kev->state & ~sh); | |
| 531 | + | return; | |
| 532 | + | } else if (MODMASK(kev->state) == PREFIX_KEYMASK && ksym == PREFIX_KEYSYM) { | |
| 533 | + | seen_prefix_key = true; | |
| 534 | + | prefix = 0; | |
| 535 | + | return; | |
| 536 | + | } | |
| 537 | + | ||
| 526 | 538 | if ((ksym == XK_Escape && MODMASK(kev->state) == 0) || | |
| 527 | 539 | (key >= '0' && key <= '9')) | |
| 528 | 540 | { | |
| @@ -545,8 +557,6 @@ void on_keypress(XKeyEvent *kev) | |||
| 545 | 557 | break; | |
| 546 | 558 | } | |
| 547 | 559 | } | |
| 548 | − | if (i == ARRLEN(keys)) | |
| 549 | − | run_key_handler(XKeysymToString(ksym), kev->state & ~sh); | |
| 550 | 560 | prefix = 0; | |
| 551 | 561 | } | |
| 552 | 562 | ||