aboutsummaryrefslogtreecommitdiff
path: root/search.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 16:07:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 16:10:32 +0000
commitc9455d5f211616ce3750e58a472e1b5a4251b8be (patch)
treea45ba347973aac6852098f3db09719bbd50d1d16 /search.c
parentkbd: break out XKB kbd struct to a separate file (diff)
kbd: move into wayland
Diffstat (limited to 'search.c')
-rw-r--r--search.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/search.c b/search.c
index 59ac0152..e9da3770 100644
--- a/search.c
+++ b/search.c
@@ -294,13 +294,13 @@ search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask
{
LOG_DBG("search: input: sym=%d/0x%x, mods=0x%08x", sym, sym, mods);
- const xkb_mod_mask_t ctrl = 1 << term->kbd.mod_ctrl;
- const xkb_mod_mask_t alt = 1 << term->kbd.mod_alt;
- //const xkb_mod_mask_t shift = 1 << term->kbd.mod_shift;
- //const xkb_mod_mask_t meta = 1 << term->kbd.mod_meta;
+ const xkb_mod_mask_t ctrl = 1 << term->wl.kbd.mod_ctrl;
+ const xkb_mod_mask_t alt = 1 << term->wl.kbd.mod_alt;
+ //const xkb_mod_mask_t shift = 1 << term->wl.kbd.mod_shift;
+ //const xkb_mod_mask_t meta = 1 << term->wl.kbd.mod_meta;
enum xkb_compose_status compose_status = xkb_compose_state_get_status(
- term->kbd.xkb_compose_state);
+ term->wl.kbd.xkb_compose_state);
/* Cancel search */
if ((mods == 0 && sym == XKB_KEY_Escape) ||
@@ -449,11 +449,11 @@ search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask
if (compose_status == XKB_COMPOSE_COMPOSED) {
count = xkb_compose_state_get_utf8(
- term->kbd.xkb_compose_state, (char *)buf, sizeof(buf));
- xkb_compose_state_reset(term->kbd.xkb_compose_state);
+ term->wl.kbd.xkb_compose_state, (char *)buf, sizeof(buf));
+ xkb_compose_state_reset(term->wl.kbd.xkb_compose_state);
} else {
count = xkb_state_key_get_utf8(
- term->kbd.xkb_state, key, (char *)buf, sizeof(buf));
+ term->wl.kbd.xkb_state, key, (char *)buf, sizeof(buf));
}
const char *src = (const char *)buf;