diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-10-27 12:04:26 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-10-27 12:04:26 +0000 |
| commit | a2b3cc6cfeda64f9f18d80776a354f5d137c3335 (patch) | |
| tree | b6c30dbe336a373d2c80adbef6c81c4e6fd43104 | |
| parent | term: move per-window wayland objects from wayland struct to terminal struct (diff) | |
term: convert anonymous 'window' struct to named 'wl_window' struct
| -rw-r--r-- | terminal.h | 32 |
1 files changed, 17 insertions, 15 deletions
@@ -38,6 +38,22 @@ struct monitor { float refresh; }; +struct wl_window { + struct wl_surface *surface; + struct xdg_wm_base *shell; + struct xdg_surface *xdg_surface; + struct xdg_toplevel *xdg_toplevel; + + struct zxdg_decoration_manager_v1 *xdg_decoration_manager; + struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration; + + /* Scrollback search */ + struct wl_surface *search_surface; + struct wl_subsurface *search_sub_surface; + + tll(const struct monitor *) on_outputs; /* Outputs we're mapped on */ +}; + struct wayland { struct wl_display *display; struct wl_registry *registry; @@ -361,21 +377,7 @@ struct terminal { } fextents; struct wayland wl; - struct { - struct wl_surface *surface; - struct xdg_wm_base *shell; - struct xdg_surface *xdg_surface; - struct xdg_toplevel *xdg_toplevel; - - struct zxdg_decoration_manager_v1 *xdg_decoration_manager; - struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration; - - /* Scrollback search */ - struct wl_surface *search_surface; - struct wl_subsurface *search_sub_surface; - - tll(const struct monitor *) on_outputs; /* Outputs we're mapped on */ - } window; + struct wl_window window; struct { int scrollback_lines; |
