diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 4 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index d707df17..423c0a22 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -70,7 +70,9 @@ struct sway_container { | |||
70 | enum sway_container_layout prev_layout; | 70 | enum sway_container_layout prev_layout; |
71 | enum sway_container_layout workspace_layout; | 71 | enum sway_container_layout workspace_layout; |
72 | 72 | ||
73 | // in output-local coordinates | 73 | // For C_ROOT, this has no meaning |
74 | // For C_OUTPUT, this is the output position in layout coordinates | ||
75 | // For other types, this is the position in output-local coordinates | ||
74 | double x, y; | 76 | double x, y; |
75 | // does not include borders or gaps. | 77 | // does not include borders or gaps. |
76 | double width, height; | 78 | double width, height; |
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 0a904c4b..fecf1582 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -23,7 +23,7 @@ struct sway_root { | |||
23 | 23 | ||
24 | struct wl_listener output_layout_change; | 24 | struct wl_listener output_layout_change; |
25 | 25 | ||
26 | struct wl_list unmanaged_views; // sway_view::unmanaged_view_link | 26 | struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link |
27 | 27 | ||
28 | struct { | 28 | struct { |
29 | struct wl_signal new_container; | 29 | struct wl_signal new_container; |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4e753b2a..4b84205e 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -39,6 +39,13 @@ struct sway_xwayland_surface { | |||
39 | int pending_width, pending_height; | 39 | int pending_width, pending_height; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | struct sway_xwayland_unmanaged { | ||
43 | struct wlr_xwayland_surface *wlr_xwayland_surface; | ||
44 | struct wl_list link; | ||
45 | |||
46 | struct wl_listener destroy; | ||
47 | }; | ||
48 | |||
42 | struct sway_wl_shell_surface { | 49 | struct sway_wl_shell_surface { |
43 | struct sway_view *view; | 50 | struct sway_view *view; |
44 | 51 | ||
@@ -127,9 +134,6 @@ void view_damage_from(struct sway_view *view); | |||
127 | 134 | ||
128 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); | 135 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); |
129 | 136 | ||
130 | void view_map_unmanaged(struct sway_view *view, | ||
131 | struct wlr_surface *wlr_surface); | ||
132 | |||
133 | void view_unmap(struct sway_view *view); | 137 | void view_unmap(struct sway_view *view); |
134 | 138 | ||
135 | void view_update_position(struct sway_view *view, double ox, double oy); | 139 | void view_update_position(struct sway_view *view, double ox, double oy); |