aboutsummaryrefslogtreecommitdiff
path: root/include/sway/view.h
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-12-04 07:32:25 -0500
committerTony Crisci <tony@dubstepdish.com>2017-12-04 07:32:25 -0500
commit0896b6867536e7c12e5345ca5df94b9467c8bf24 (patch)
tree2240f512d2e55102b2ad16b4ff13a6c8124947d9 /include/sway/view.h
parent1870f116ba355fd02c8cc235fe262ccb0a03976b (diff)
parentc733e0858fcf9e54dd41f7b8882d5fe722bb01b4 (diff)
Merge branch 'wlroots' into feature/xwayland
Diffstat (limited to 'include/sway/view.h')
-rw-r--r--include/sway/view.h16
1 files changed, 15 insertions, 1 deletions
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 {
int pending_width, pending_height;
};
+struct sway_wl_shell_surface {
+ struct sway_view *view;
+
+ struct wl_listener commit;
+ struct wl_listener request_move;
+ struct wl_listener request_resize;
+ struct wl_listener request_maximize;
+ struct wl_listener destroy;
+
+ int pending_width, pending_height;
+};
+
enum sway_view_type {
SWAY_WL_SHELL_VIEW,
SWAY_XDG_SHELL_V6_VIEW,
@@ -43,9 +55,9 @@ enum sway_view_type {
enum sway_view_prop {
VIEW_PROP_TITLE,
+ VIEW_PROP_APP_ID,
VIEW_PROP_CLASS,
VIEW_PROP_INSTANCE,
- VIEW_PROP_APP_ID,
};
/**
@@ -61,11 +73,13 @@ struct sway_view {
union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
struct wlr_xwayland_surface *wlr_xwayland_surface;
+ struct wlr_wl_shell_surface *wlr_wl_shell_surface;
};
union {
struct sway_xdg_surface_v6 *sway_xdg_surface_v6;
struct sway_xwayland_surface *sway_xwayland_surface;
+ struct sway_wl_shell_surface *sway_wl_shell_surface;
};
struct {