aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-07 21:22:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-08 17:06:10 +0000
commit352077c78aaf4e51759e37d1279d3c8ce7d70600 (patch)
tree936b34acc26a6fcf5ea7df881cf9c3dad5780350
parentkitty: when emitting associated text, don’t report mods/events unless necessary (diff)
kitty: simplify: always calculate alternate/base keys
But only _emit_ them if report alternate has been enabled.
-rw-r--r--input.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/input.c b/input.c
index 4ced612a..d2cda4aa 100644
--- a/input.c
+++ b/input.c
@@ -1432,25 +1432,20 @@ emit_escapes:
if (key == 0)
key = sym_to_use;
- if (report_alternate)
- alternate = xkb_keysym_to_utf32(sym);
- }
-
- if (report_alternate) {
/* The *shifted* key. May be the same as the unshifted
* key - if so, this is filtered out below, when
* emitting the CSI */
+ alternate = xkb_keysym_to_utf32(sym);
+ }
- /* Base layout key. I.e the symbol the pressed key
- * produces in the base/default layout (layout idx
- * 0) */
- const xkb_keysym_t *base_syms;
- int base_sym_count = xkb_keymap_key_get_syms_by_level(
- seat->kbd.xkb_keymap, ctx->key, 0, 0, &base_syms);
+ /* Base layout key. I.e the symbol the pressed key produces in
+ * the base/default layout (layout idx 0) */
+ const xkb_keysym_t *base_syms;
+ int base_sym_count = xkb_keymap_key_get_syms_by_level(
+ seat->kbd.xkb_keymap, ctx->key, 0, 0, &base_syms);
- if (base_sym_count > 0)
- base = xkb_keysym_to_utf32(base_syms[0]);
- }
+ if (base_sym_count > 0)
+ base = xkb_keysym_to_utf32(base_syms[0]);
final = 'u';
break;