aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-29 11:13:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-29 11:13:58 +0000
commitc917a74f487941fa16548261680484cb78e63189 (patch)
tree2b3fb5dad7e59b48adad57301f8821c49aa0de69 /input.c
parentwayland: store pointer to window instance in all surfaces (diff)
wayland: remove all usages of wayl_terminal_from_surface()
Use the 'user data' pointer from the wayland surface instead.
Diffstat (limited to 'input.c')
-rw-r--r--input.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/input.c b/input.c
index d77061eb..a7a78a5d 100644
--- a/input.c
+++ b/input.c
@@ -88,9 +88,11 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
assert(surface != NULL);
struct wayland *wayl = data;
+ struct wl_window *win = wl_surface_get_user_data(surface);
+ struct terminal *term = win->term;
+
+ wayl->kbd_focus = term;
wayl->input_serial = serial;
- wayl->kbd_focus = wayl_terminal_from_surface(wayl, surface);
- assert(wayl->kbd_focus != NULL);
term_kbd_focus_in(wayl->kbd_focus);
term_xcursor_update(wayl->kbd_focus);
@@ -147,7 +149,8 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
assert(
wayl->kbd_focus == NULL ||
surface == NULL || /* Seen on Sway 1.2 */
- wayl_terminal_from_surface(wayl, surface) == wayl->kbd_focus);
+ ((const struct wl_window *)wl_surface_get_user_data(surface))->term == wayl->kbd_focus
+ );
struct terminal *old_focused = wayl->kbd_focus;
wayl->kbd_focus = NULL;