diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
commit | 0896b6867536e7c12e5345ca5df94b9467c8bf24 (patch) | |
tree | 2240f512d2e55102b2ad16b4ff13a6c8124947d9 /include | |
parent | xwayland shell (diff) | |
parent | Merge pull request #1493 from acrisci/feature/wl-shell (diff) | |
download | sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.gz sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.zst sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.zip |
Merge branch 'wlroots' into feature/xwayland
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/server.h | 4 | ||||
-rw-r--r-- | include/sway/view.h | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 30b15e75..3fa72e84 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -33,6 +33,9 @@ struct sway_server { | |||
33 | 33 | ||
34 | struct wlr_xwayland *xwayland; | 34 | struct wlr_xwayland *xwayland; |
35 | struct wl_listener xwayland_surface; | 35 | struct wl_listener xwayland_surface; |
36 | |||
37 | struct wlr_wl_shell *wl_shell; | ||
38 | struct wl_listener wl_shell_surface; | ||
36 | }; | 39 | }; |
37 | 40 | ||
38 | struct sway_server server; | 41 | struct sway_server server; |
@@ -46,5 +49,6 @@ void output_remove_notify(struct wl_listener *listener, void *data); | |||
46 | 49 | ||
47 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 50 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
48 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 51 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
52 | void handle_wl_shell_surface(struct wl_listener *listener, void *data); | ||
49 | 53 | ||
50 | #endif | 54 | #endif |
diff --git a/include/sway/view.h b/include/sway/view.h index 2d9b4ef5..83ac8285 100644 --- a/include/sway/view.h +++ b/include/sway/view.h | |||
@@ -33,6 +33,18 @@ struct sway_xwayland_surface { | |||
33 | int pending_width, pending_height; | 33 | int pending_width, pending_height; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | struct sway_wl_shell_surface { | ||
37 | struct sway_view *view; | ||
38 | |||
39 | struct wl_listener commit; | ||
40 | struct wl_listener request_move; | ||
41 | struct wl_listener request_resize; | ||
42 | struct wl_listener request_maximize; | ||
43 | struct wl_listener destroy; | ||
44 | |||
45 | int pending_width, pending_height; | ||
46 | }; | ||
47 | |||
36 | enum sway_view_type { | 48 | enum sway_view_type { |
37 | SWAY_WL_SHELL_VIEW, | 49 | SWAY_WL_SHELL_VIEW, |
38 | SWAY_XDG_SHELL_V6_VIEW, | 50 | SWAY_XDG_SHELL_V6_VIEW, |
@@ -43,9 +55,9 @@ enum sway_view_type { | |||
43 | 55 | ||
44 | enum sway_view_prop { | 56 | enum sway_view_prop { |
45 | VIEW_PROP_TITLE, | 57 | VIEW_PROP_TITLE, |
58 | VIEW_PROP_APP_ID, | ||
46 | VIEW_PROP_CLASS, | 59 | VIEW_PROP_CLASS, |
47 | VIEW_PROP_INSTANCE, | 60 | VIEW_PROP_INSTANCE, |
48 | VIEW_PROP_APP_ID, | ||
49 | }; | 61 | }; |
50 | 62 | ||
51 | /** | 63 | /** |
@@ -61,11 +73,13 @@ struct sway_view { | |||
61 | union { | 73 | union { |
62 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 74 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
63 | struct wlr_xwayland_surface *wlr_xwayland_surface; | 75 | struct wlr_xwayland_surface *wlr_xwayland_surface; |
76 | struct wlr_wl_shell_surface *wlr_wl_shell_surface; | ||
64 | }; | 77 | }; |
65 | 78 | ||
66 | union { | 79 | union { |
67 | struct sway_xdg_surface_v6 *sway_xdg_surface_v6; | 80 | struct sway_xdg_surface_v6 *sway_xdg_surface_v6; |
68 | struct sway_xwayland_surface *sway_xwayland_surface; | 81 | struct sway_xwayland_surface *sway_xwayland_surface; |
82 | struct sway_wl_shell_surface *sway_wl_shell_surface; | ||
69 | }; | 83 | }; |
70 | 84 | ||
71 | struct { | 85 | struct { |