4 files changed, 22 insertions, 14 deletions
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index cf000019..d382b593 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -64,6 +64,10 @@ struct wlr_output {
 		struct wl_signal destroy;
 	} events;
 
+	struct wlr_surface *fullscreen_surface;
+	struct wl_listener fullscreen_surface_commit;
+	struct wl_listener fullscreen_surface_destroy;
+
 	struct wl_list cursors; // wlr_output_cursor::link
 	struct wlr_output_cursor *hardware_cursor;
 
@@ -89,6 +93,8 @@ void wlr_output_swap_buffers(struct wlr_output *output);
 void wlr_output_set_gamma(struct wlr_output *output,
 	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b);
 uint32_t wlr_output_get_gamma_size(struct wlr_output *output);
+void wlr_output_set_fullscreen_surface(struct wlr_output *output,
+	struct wlr_surface *surface);
 
 struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);
 bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index cea53109..c8e3761a 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -1,9 +1,10 @@
 #ifndef WLR_TYPES_WLR_SURFACE_H
 #define WLR_TYPES_WLR_SURFACE_H
-#include <wayland-server.h>
-#include <pixman.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <time.h>
+#include <pixman.h>
+#include <wayland-server.h>
 #include <wlr/types/wlr_output.h>
 
 struct wlr_frame_callback {
@@ -142,4 +143,7 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
 void wlr_surface_send_leave(struct wlr_surface *surface,
 		struct wlr_output *output);
 
+void wlr_surface_send_frame_done(struct wlr_surface *surface,
+		const struct timespec *when);
+
 #endif
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 24936a34..ec087693 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -81,8 +81,8 @@ struct wlr_wl_shell_surface {
 
 		struct wl_signal request_move;
 		struct wl_signal request_resize;
-		struct wl_signal request_set_fullscreen;
-		struct wl_signal request_set_maximized;
+		struct wl_signal request_fullscreen;
+		struct wl_signal request_maximize;
 
 		struct wl_signal set_state;
 		struct wl_signal set_title;
@@ -93,14 +93,12 @@ struct wlr_wl_shell_surface {
 };
 
 struct wlr_wl_shell_surface_move_event {
-	struct wl_client *client;
 	struct wlr_wl_shell_surface *surface;
 	struct wlr_seat_client *seat;
 	uint32_t serial;
 };
 
 struct wlr_wl_shell_surface_resize_event {
-	struct wl_client *client;
 	struct wlr_wl_shell_surface *surface;
 	struct wlr_seat_client *seat;
 	uint32_t serial;
@@ -108,15 +106,13 @@ struct wlr_wl_shell_surface_resize_event {
 };
 
 struct wlr_wl_shell_surface_set_fullscreen_event {
-	struct wl_client *client;
 	struct wlr_wl_shell_surface *surface;
 	enum wl_shell_surface_fullscreen_method method;
 	uint32_t framerate;
 	struct wlr_output *output;
 };
 
-struct wlr_wl_shell_surface_set_maximized_event {
-	struct wl_client *client;
+struct wlr_wl_shell_surface_maximize_event {
 	struct wlr_wl_shell_surface *surface;
 	struct wlr_output *output;
 };
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 6ac84cef..4eb957be 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -139,27 +139,29 @@ struct wlr_xdg_surface_v6 {
 };
 
 struct wlr_xdg_toplevel_v6_move_event {
-	struct wl_client *client;
 	struct wlr_xdg_surface_v6 *surface;
 	struct wlr_seat_client *seat;
 	uint32_t serial;
 };
 
 struct wlr_xdg_toplevel_v6_resize_event {
-	struct wl_client *client;
 	struct wlr_xdg_surface_v6 *surface;
 	struct wlr_seat_client *seat;
 	uint32_t serial;
 	uint32_t edges;
 };
 
+struct wlr_xdg_toplevel_v6_set_fullscreen_event {
+	struct wlr_xdg_surface_v6 *surface;
+	bool fullscreen;
+	struct wlr_output *output;
+};
+
 struct wlr_xdg_toplevel_v6_show_window_menu_event {
-	struct wl_client *client;
 	struct wlr_xdg_surface_v6 *surface;
 	struct wlr_seat_client *seat;
 	uint32_t serial;
-	uint32_t x;
-	uint32_t y;
+	uint32_t x, y;
 };
 
 struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display);