diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-04 22:12:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 22:12:32 -0400 |
commit | 21aedf15052df4e7f8ee72922fa0e214d690facc (patch) | |
tree | 42039b2d318ab944dd148990329b4a2cf94fd9a3 /include | |
parent | Merge pull request #1707 from acrisci/transparency (diff) | |
parent | Use new wlr_*_surface_at functions (diff) | |
download | sway-21aedf15052df4e7f8ee72922fa0e214d690facc.tar.gz sway-21aedf15052df4e7f8ee72922fa0e214d690facc.tar.zst sway-21aedf15052df4e7f8ee72922fa0e214d690facc.zip |
Merge pull request #1732 from emersion/view-children
Update for wlroots#824
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/view.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4b84205e..f32ccc5a 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -59,11 +59,9 @@ struct sway_wl_shell_surface { | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | enum sway_view_type { | 61 | enum sway_view_type { |
62 | SWAY_WL_SHELL_VIEW, | 62 | SWAY_VIEW_WL_SHELL, |
63 | SWAY_XDG_SHELL_V6_VIEW, | 63 | SWAY_VIEW_XDG_SHELL_V6, |
64 | SWAY_XWAYLAND_VIEW, | 64 | SWAY_VIEW_XWAYLAND, |
65 | // Keep last | ||
66 | SWAY_VIEW_TYPES, | ||
67 | }; | 65 | }; |
68 | 66 | ||
69 | enum sway_view_prop { | 67 | enum sway_view_prop { |
@@ -101,9 +99,6 @@ struct sway_view { | |||
101 | struct sway_xwayland_surface *sway_xwayland_surface; | 99 | struct sway_xwayland_surface *sway_xwayland_surface; |
102 | struct sway_wl_shell_surface *sway_wl_shell_surface; | 100 | struct sway_wl_shell_surface *sway_wl_shell_surface; |
103 | }; | 101 | }; |
104 | |||
105 | // only used for unmanaged views (shell specific) | ||
106 | struct wl_list unmanaged_view_link; // sway_root::unmanaged_views | ||
107 | }; | 102 | }; |
108 | 103 | ||
109 | struct sway_view *view_create(enum sway_view_type type, | 104 | struct sway_view *view_create(enum sway_view_type type, |