aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sway/server.h4
-rw-r--r--include/sway/view.h17
2 files changed, 19 insertions, 2 deletions
diff --git a/include/sway/server.h b/include/sway/server.h
index b0684d15..bfdb7b8a 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -30,6 +30,9 @@ struct sway_server {
struct wlr_xdg_shell_v6 *xdg_shell_v6;
struct wl_listener xdg_shell_v6_surface;
+
+ struct wlr_wl_shell *wl_shell;
+ struct wl_listener wl_shell_surface;
};
struct sway_server server;
@@ -42,5 +45,6 @@ void output_add_notify(struct wl_listener *listener, void *data);
void output_remove_notify(struct wl_listener *listener, void *data);
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
+void handle_wl_shell_surface(struct wl_listener *listener, void *data);
#endif
diff --git a/include/sway/view.h b/include/sway/view.h
index cf2e6f66..f87a8d5b 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -19,6 +19,18 @@ struct sway_xdg_surface_v6 {
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,
@@ -29,9 +41,8 @@ enum sway_view_type {
enum sway_view_prop {
VIEW_PROP_TITLE,
- VIEW_PROP_CLASS,
- VIEW_PROP_INSTANCE,
VIEW_PROP_APP_ID,
+ VIEW_PROP_INSTANCE,
};
/**
@@ -46,10 +57,12 @@ struct sway_view {
union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
+ struct wlr_wl_shell_surface *wlr_wl_shell_surface;
};
union {
struct sway_xdg_surface_v6 *sway_xdg_surface_v6;
+ struct sway_wl_shell_surface *sway_wl_shell_surface;
};
struct {