mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-11 08:21:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: wayland struct is now not a part of the terminal struct

Browse source 
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.
This commit is contained in:
Daniel Eklöf 2019-10-27 18:51:14 +01:00
parent 33e4b8a5b8
commit 1adab32906
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
8 changed files with 115 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

18
search.c
View file

@ -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;