diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-01-03 12:37:03 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-01-03 12:37:03 +0000 |
| commit | 9a0238bb524668c3ea24465943cd231167ae1428 (patch) | |
| tree | f8e31ab7f7b4bc23b39a338070bfa1f5478e3802 | |
| parent | render: render_resize(): don't do anything if width or height is 0 (diff) | |
wayland: window now keeps pointer to owning terminal, not wayland
| -rw-r--r-- | terminal.c | 2 | ||||
| -rw-r--r-- | wayland.c | 12 | ||||
| -rw-r--r-- | wayland.h | 4 |
3 files changed, 10 insertions, 8 deletions
@@ -654,7 +654,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl, goto err; /* Initialize the Wayland window backend */ - if ((term->window = wayl_win_init(wayl)) == NULL) + if ((term->window = wayl_win_init(term)) == NULL) goto err; /* Let the Wayland backend know we exist */ @@ -825,10 +825,12 @@ wayl_destroy(struct wayland *wayl) } struct wl_window * -wayl_win_init(struct wayland *wayl) +wayl_win_init(struct terminal *term) { + struct wayland *wayl = term->wl; + struct wl_window *win = calloc(1, sizeof(*win)); - win->wayl = wayl; + win->term = term; win->surface = wl_compositor_create_surface(wayl->compositor); if (win->surface == NULL) { @@ -887,12 +889,12 @@ wayl_win_destroy(struct wl_window *win) /* Scrollback search */ wl_surface_attach(win->search_surface, NULL, 0, 0); wl_surface_commit(win->search_surface); - wl_display_roundtrip(win->wayl->display); + wl_display_roundtrip(win->term->wl->display); /* Main window */ wl_surface_attach(win->surface, NULL, 0, 0); wl_surface_commit(win->surface); - wl_display_roundtrip(win->wayl->display); + wl_display_roundtrip(win->term->wl->display); tll_free(win->on_outputs); if (win->search_sub_surface != NULL) @@ -910,7 +912,7 @@ wayl_win_destroy(struct wl_window *win) if (win->surface != NULL) wl_surface_destroy(win->surface); - wl_display_roundtrip(win->wayl->display); + wl_display_roundtrip(win->term->wl->display); free(win); } @@ -84,7 +84,7 @@ struct wl_primary { struct wayland; struct wl_window { - struct wayland *wayl; + struct terminal *term; struct wl_surface *surface; struct xdg_surface *xdg_surface; struct xdg_toplevel *xdg_toplevel; @@ -181,5 +181,5 @@ struct terminal *wayl_terminal_from_xdg_toplevel( /* TODO: pass something other than 'term'? Need scale... */ bool wayl_cursor_set(struct wayland *wayl, const struct terminal *term); -struct wl_window *wayl_win_init(struct wayland *wayl); +struct wl_window *wayl_win_init(struct terminal *term); void wayl_win_destroy(struct wl_window *win); |
