1 files changed, 10 insertions, 10 deletions

diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 11d30d95..0b18a131 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -21,7 +21,7 @@ struct wlr_wl_shell_surface_transient_state {
 	struct wlr_wl_shell_surface *parent;
 	int32_t x;
 	int32_t y;
-	uint32_t flags;
+	enum wl_shell_surface_transient flags;
 };
 
 struct wlr_wl_shell_surface_popup_state {
@@ -29,11 +29,11 @@ struct wlr_wl_shell_surface_popup_state {
 	uint32_t serial;
 };
 
-enum wlr_wl_shell_surface_role {
-	WLR_WL_SHELL_SURFACE_ROLE_NONE,
-	WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL,
-	WLR_WL_SHELL_SURFACE_ROLE_TRANSCIENT,
-	WLR_WL_SHELL_SURFACE_ROLE_POPUP,
+enum wlr_wl_shell_surface_state {
+	WLR_WL_SHELL_SURFACE_STATE_NONE,
+	WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL,
+	WLR_WL_SHELL_SURFACE_STATE_TRANSIENT,
+	WLR_WL_SHELL_SURFACE_STATE_POPUP,
 };
 
 struct wlr_wl_shell_surface {
@@ -46,7 +46,7 @@ struct wlr_wl_shell_surface {
 	uint32_t ping_serial;
 	struct wl_event_source *ping_timer;
 
-	enum wlr_wl_shell_surface_role role;
+	enum wlr_wl_shell_surface_state state;
 	struct wlr_wl_shell_surface_transient_state *transient_state;
 	struct wlr_wl_shell_surface_popup_state *popup_state;
 
@@ -64,7 +64,7 @@ struct wlr_wl_shell_surface {
 		struct wl_signal request_set_fullscreen;
 		struct wl_signal request_set_maximized;
 
-		struct wl_signal set_role;
+		struct wl_signal set_state;
 		struct wl_signal set_title;
 		struct wl_signal set_class;
 	} events;
@@ -84,13 +84,13 @@ struct wlr_wl_shell_surface_resize_event {
 	struct wlr_wl_shell_surface *surface;
 	struct wlr_seat_handle *seat_handle;
 	uint32_t serial;
-	uint32_t edges;
+	enum wl_shell_surface_resize edges;
 };
 
 struct wlr_wl_shell_surface_set_fullscreen_event {
 	struct wl_client *client;
 	struct wlr_wl_shell_surface *surface;
-	uint32_t method;
+	enum wl_shell_surface_fullscreen_method method;
 	uint32_t framerate;
 	struct wlr_output *output;
 };