From a2b3cc6cfeda64f9f18d80776a354f5d137c3335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 27 Oct 2019 13:04:26 +0100 Subject: [PATCH] term: convert anonymous 'window' struct to named 'wl_window' struct --- terminal.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/terminal.h b/terminal.h index 643eaa65..71f190cc 100644 --- a/terminal.h +++ b/terminal.h @@ -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;