aboutsummaryrefslogtreecommitdiff
path: root/search.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 17:51:14 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 17:51:14 +0000
commit1adab32906b5455781921b779019a6d3f0e4fe56 (patch)
tree759bc5378613ec071d504c6c16dc19bd372dc428 /search.c
parentwayland: pull in sys/time.h, for 'struct timeval' (diff)
term: wayland struct is now not a part of the terminal struct
We do however need access to it, so provide a pointer. The difference is that now we can have a *single* wayland instance, but multiple terminal instances.
Diffstat (limited to 'search.c')
-rw-r--r--search.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/search.c b/search.c
index 5c0ce1b7..e055b478 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->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;
+ 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->wl.kbd.xkb_compose_state);
+ term->wl->kbd.xkb_compose_state);
/* Cancel search */
if ((mods == 0 && sym == XKB_KEY_Escape) ||
@@ -317,7 +317,7 @@ search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask
/* "Commit" search - copy selection to primary and cancel search */
else if (mods == 0 && sym == XKB_KEY_Return) {
- selection_finalize(term, term->wl.input_serial);
+ selection_finalize(term, term->wl->input_serial);
search_cancel_keep_selection(term);
return;
}
@@ -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->wl.kbd.xkb_compose_state, (char *)buf, sizeof(buf));
- xkb_compose_state_reset(term->wl.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->wl.kbd.xkb_state, key, (char *)buf, sizeof(buf));
+ term->wl->kbd.xkb_state, key, (char *)buf, sizeof(buf));
}
const char *src = (const char *)buf;