mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-05-05 06:47:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: window: pass window pointer to wl-surface callbacks

Browse source
This commit is contained in:
Daniel Eklöf 2020-01-03 13:40:37 +01:00
parent 9a0238bb52
commit 9372fb4166
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
wayland.c
View file

@ -361,10 +361,10 @@ static void
surface_enter(void *data, struct wl_surface *wl_surface, surface_enter(void *data, struct wl_surface *wl_surface,
struct wl_output *wl_output) struct wl_output *wl_output)
{ {
struct wayland *wayl = data; struct wl_window *win = data;
struct terminal *term = wayl_terminal_from_surface(wayl, wl_surface); struct terminal *term = win->term;
tll_foreach(wayl->monitors, it) { tll_foreach(term->wl->monitors, it) {
if (it->item.output == wl_output) { if (it->item.output == wl_output) {
LOG_DBG("mapped on %s", it->item.name); LOG_DBG("mapped on %s", it->item.name);
tll_push_back(term->window->on_outputs, &it->item); tll_push_back(term->window->on_outputs, &it->item);
@ -372,7 +372,7 @@ surface_enter(void *data, struct wl_surface *wl_surface,
/* Resize, since scale-to-use may have changed */ /* Resize, since scale-to-use may have changed */
int scale = term->scale; int scale = term->scale;
render_resize(term, term->width / scale, term->height / scale, true); render_resize(term, term->width / scale, term->height / scale, true);
wayl_reload_cursor_theme(wayl, term); wayl_reload_cursor_theme(term->wl, term);
return; return;
} }
} }
@ -384,8 +384,8 @@ static void
surface_leave(void *data, struct wl_surface *wl_surface, surface_leave(void *data, struct wl_surface *wl_surface,
struct wl_output *wl_output) struct wl_output *wl_output)
{ {
struct wayland *wayl = data; struct wl_window *win = data;
struct terminal *term = wayl_terminal_from_surface(wayl, wl_surface); struct terminal *term = win->term;
tll_foreach(term->window->on_outputs, it) { tll_foreach(term->window->on_outputs, it) {
if (it->item->output != wl_output) if (it->item->output != wl_output)
@ -397,7 +397,7 @@ surface_leave(void *data, struct wl_surface *wl_surface,
/* Resize, since scale-to-use may have changed */ /* Resize, since scale-to-use may have changed */
int scale = term->scale; int scale = term->scale;
render_resize(term, term->width / scale, term->height / scale, true); render_resize(term, term->width / scale, term->height / scale, true);
wayl_reload_cursor_theme(wayl, term); wayl_reload_cursor_theme(term->wl, term);
return; return;
} }
@ -838,7 +838,7 @@ wayl_win_init(struct terminal *term)
goto out; goto out;
} }
wl_surface_add_listener(win->surface, &surface_listener, wayl); wl_surface_add_listener(win->surface, &surface_listener, win);
win->xdg_surface = xdg_wm_base_get_xdg_surface(wayl->shell, win->surface); win->xdg_surface = xdg_wm_base_get_xdg_surface(wayl->shell, win->surface);
xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, wayl); xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, wayl);