aboutsummaryrefslogtreecommitdiff
path: root/terminal.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 11:57:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 11:57:37 +0000
commitf63458ef3387eac67a402e6ce7bedd91eb49d9bc (patch)
tree44d2c73d0adc6b0d5e06e40298d10ecfa0a94f21 /terminal.h
parentfdm: use the FDM's poll loop (diff)
term: move per-window wayland objects from wayland struct to terminal struct
Short term, we want to break out the wayland backend from the terminal struct. Long term, we might want to support multiple windows. One step towards both the above is separating global wayland objects from per-window objects.
Diffstat (limited to 'terminal.h')
-rw-r--r--terminal.h30
1 files changed, 16 insertions, 14 deletions
diff --git a/terminal.h b/terminal.h
index a10e1928..643eaa65 100644
--- a/terminal.h
+++ b/terminal.h
@@ -67,22 +67,8 @@ struct wayland {
char *theme_name;
} pointer;
- /* Main 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;
-
bool have_argb8888;
tll(struct monitor) monitors; /* All available outputs */
- tll(const struct monitor *) on_outputs; /* Outputs we're mapped on */
};
struct rgb { float r, g, b; };
@@ -376,6 +362,22 @@ struct terminal {
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 {
int scrollback_lines;
struct wl_callback *frame_callback;