diff options
author | NRK <nrk@disroot.org> | 2022-08-16 10:53:05 +0200 |
---|---|---|
committer | NRK <nrk@disroot.org> | 2022-08-16 10:53:05 +0200 |
commit | 6578e6eb6533a6651bd88ecae7720aced88c8c2f (patch) | |
tree | 4aed4b6f10e012527c3aaf484826dba9a81b39a5 /main.c | |
parent | 216f312578be5c959527c03ccc70d27eebcc76aa (diff) | |
download | nsxiv-6578e6eb6533a6651bd88ecae7720aced88c8c2f.tar.zst |
code-style: various cleanups (#356)
* run_key_handler: make the logic easier to follow
* remove timeout_t
the typedef is not needed. inline the declaration similar to the other
static structs.
* simplify estrdup
reuse emalloc, instead of calling malloc and null-checking.
* win_clear: initialize `e` right away
* process_bindings: explicitly check against NULL
most pointer checks in the codebase do explicit check.
* use a named constant instead of magic number
also changes the padding from 3 to 4 bytes according to [0]. but i
couldn't find any situtation where this mattered, so perhaps the current
padding is enough. but doesn't hurt adding one more byte.
[0]: https://nullprogram.com/blog/2017/10/06/
Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/356
Reviewed-by: explosion-mental <explosion-mental@noreply.codeberg.org>
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 36 |
1 files changed, 16 insertions, 20 deletions
@@ -51,12 +51,6 @@ } typedef struct { - struct timeval when; - bool active; - timeout_f handler; -} timeout_t; - -typedef struct { int err; char *cmd; } extcmd_t; @@ -98,12 +92,16 @@ static struct { bool title_dirty; -static timeout_t timeouts[] = { - { { 0, 0 }, false, redraw }, - { { 0, 0 }, false, reset_cursor }, - { { 0, 0 }, false, slideshow }, - { { 0, 0 }, false, animate }, - { { 0, 0 }, false, clear_resize }, +static struct { + timeout_f handler; + struct timeval when; + bool active; +} timeouts[] = { + { redraw }, + { reset_cursor }, + { slideshow }, + { animate }, + { clear_resize }, }; /************************** @@ -611,14 +609,12 @@ static bool run_key_handler(const char *key, unsigned int mask) /* drop user input events that occurred while running the key handler */ while (XCheckIfEvent(win.env.dpy, &dump, is_input_ev, NULL)); - if (mode == MODE_IMAGE) { - if (changed) { - img_close(&img, true); - load_image(fileidx); - } - } - if (mode == MODE_THUMB || !changed) + if (mode == MODE_IMAGE && changed) { + img_close(&img, true); + load_image(fileidx); + } else { open_info(); + } free(oldst); reset_cursor(); return true; @@ -633,7 +629,7 @@ static bool process_bindings(const keymap_t *bindings, unsigned int len, KeySym for (i = 0; i < len; i++) { if (bindings[i].ksym_or_button == ksym_or_button && MODMASK(bindings[i].mask | implicit_mod) == MODMASK(state) && - bindings[i].cmd.func && + bindings[i].cmd.func != NULL && (bindings[i].cmd.mode == MODE_ALL || bindings[i].cmd.mode == mode)) { if (bindings[i].cmd.func(bindings[i].arg)) |