From 59db38ce17e04b19c25e06f0fd3622b2adace99f Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 3 Dec 2017 10:49:13 -0500
Subject: sway wl_shell

---
 include/sway/server.h | 1 +
 include/sway/view.h   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/sway/server.h b/include/sway/server.h
index b0684d15..1901e39f 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -42,5 +42,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 2707ca78..77d451e5 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -29,9 +29,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 +45,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 {
-- 
cgit v1.2.3