From a7446792a1a0fd9fe3391f041d7bbfe9e2b11255 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 22 Oct 2017 23:19:21 -0400
Subject: Consider scale factor when rendering views

---
 include/rootston/view.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 993ff654..4a5e8d08 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -48,6 +48,7 @@ enum roots_view_type {
 
 struct roots_view {
 	struct roots_desktop *desktop;
+	struct roots_output *output;
 	double x, y;
 	float rotation;
 	// TODO: Something for roots-enforced width/height
-- 
cgit v1.2.3


From a6930cd8ea2424f12aafc8d0b67426d0e5161c44 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 25 Oct 2017 22:37:02 -0400
Subject: Handle output enter/leave correctly

---
 include/rootston/view.h         |  5 ++--
 include/wlr/types/wlr_surface.h |  3 +++
 rootston/desktop.c              | 59 +++++++++++++++++++++++------------------
 rootston/xdg_shell_v6.c         |  2 +-
 types/wlr_output.c              |  1 -
 types/wlr_surface.c             | 13 ++++++++-
 6 files changed, 51 insertions(+), 32 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 4a5e8d08..79d61ba6 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -48,7 +48,6 @@ enum roots_view_type {
 
 struct roots_view {
 	struct roots_desktop *desktop;
-	struct roots_output *output;
 	double x, y;
 	float rotation;
 	// TODO: Something for roots-enforced width/height
@@ -72,14 +71,14 @@ struct roots_view {
 	// configure event from the xdg_shell
 	// If not then this should follow the typical type/impl pattern we use
 	// elsewhere
-	void (*get_size)(struct roots_view *view, struct wlr_box *box);
+	void (*get_size)(const struct roots_view *view, struct wlr_box *box);
 	void (*activate)(struct roots_view *view, bool active);
 	void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
 	void (*set_position)(struct roots_view *view, double x, double y);
 	void (*close)(struct roots_view *view);
 };
 
-void view_get_size(struct roots_view *view, struct wlr_box *box);
+void view_get_size(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
 void view_set_position(struct roots_view *view, double x, double y);
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index e1a07566..cea53109 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -139,4 +139,7 @@ struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
 void wlr_surface_send_enter(struct wlr_surface *surface,
 		struct wlr_output *output);
 
+void wlr_surface_send_leave(struct wlr_surface *surface,
+		struct wlr_output *output);
+
 #endif
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 37022ca4..0cc2180d 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -35,45 +35,52 @@ void view_destroy(struct roots_view *view) {
 	free(view);
 }
 
-void view_get_size(struct roots_view *view, struct wlr_box *box) {
+void view_get_size(const struct roots_view *view, struct wlr_box *box) {
 	if (view->get_size) {
 		view->get_size(view, box);
-		return;
+	} else {
+		box->width = view->wlr_surface->current->width;
+		box->height = view->wlr_surface->current->height;
 	}
-	box->x = box->y = 0;
-	box->width = view->wlr_surface->current->width;
-	box->height = view->wlr_surface->current->height;
+	box->x = view->x;
+	box->y = view->y;
 }
 
-static void view_update_output(struct roots_view *view) {
+static void view_update_output(const struct roots_view *view,
+		const struct wlr_box *before) {
 	struct roots_desktop *desktop = view->desktop;
-	struct roots_output *output = NULL, *_output;
+	struct roots_output *output;
 	struct wlr_box box;
 	view_get_size(view, &box);
-	wl_list_for_each(_output, &desktop->outputs, link) {
-		if (!wlr_output_layout_intersects(desktop->layout, _output->wlr_output,
-			view->x, view->y, view->x + box.width, view->x + box.height)) {
-			continue;
+	wl_list_for_each(output, &desktop->outputs, link) {
+		bool intersected = before->x != -1 && wlr_output_layout_intersects(
+				desktop->layout, output->wlr_output,
+				before->x, before->y, before->x + before->width,
+				before->y + before->height);
+		bool intersects = wlr_output_layout_intersects(
+				desktop->layout, output->wlr_output,
+				view->x, view->y, view->x + box.width, view->y + box.height);
+		if (intersected && !intersects) {
+			wlr_log(L_DEBUG, "Leaving output %s", output->wlr_output->name);
+			wlr_surface_send_leave(view->wlr_surface, output->wlr_output);
 		}
-		if (output == NULL
-				|| output->wlr_output->scale < _output->wlr_output->scale) {
-			output = _output;
+		if (!intersected && intersects) {
+			wlr_log(L_DEBUG, "Entering output %s", output->wlr_output->name);
+			wlr_surface_send_enter(view->wlr_surface, output->wlr_output);
 		}
 	}
-	if (output && output != view->output) {
-		view->output = output;
-		wlr_surface_send_enter(view->wlr_surface, output->wlr_output);
-	}
 }
 
 void view_set_position(struct roots_view *view, double x, double y) {
+	struct wlr_box before;
+	view_get_size(view, &before);
 	if (view->set_position) {
 		view->set_position(view, x, y);
 	} else {
 		view->x = x;
 		view->y = y;
 	}
-	view_update_output(view);
+	view_update_output(view, &before);
 }
 
 void view_activate(struct roots_view *view, bool activate) {
@@ -83,10 +90,12 @@ void view_activate(struct roots_view *view, bool activate) {
 }
 
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
+	struct wlr_box before;
+	view_get_size(view, &before);
 	if (view->resize) {
 		view->resize(view, width, height);
 	}
-	view_update_output(view);
+	view_update_output(view, &before);
 }
 
 void view_close(struct roots_view *view) {
@@ -96,8 +105,8 @@ void view_close(struct roots_view *view) {
 }
 
 bool view_center(struct roots_view *view) {
-	struct wlr_box size;
-	view_get_size(view, &size);
+	struct wlr_box box;
+	view_get_size(view, &box);
 
 	struct roots_desktop *desktop = view->desktop;
 	struct wlr_cursor *cursor = desktop->server->input->cursor;
@@ -122,16 +131,14 @@ bool view_center(struct roots_view *view) {
 
 	double view_x = (double)(width - size.width) / 2 + l_output->x;
 	double view_y = (double)(height - size.height) / 2 + l_output->y;
-
 	view_set_position(view, view_x, view_y);
 
 	return true;
 }
 
-void view_setup(struct roots_view *view) {
-	view_center(view);
-
+void view_initialize(struct roots_view *view) {
 	struct roots_input *input = view->desktop->server->input;
+	view_center(view);
 	set_view_focus(input, view->desktop, view);
 	wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
 	view_update_output(view);
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 704ccb1e..2d83019f 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -10,7 +10,7 @@
 #include "rootston/server.h"
 #include "rootston/input.h"
 
-static void get_size(struct roots_view *view, struct wlr_box *box) {
+static void get_size(const struct roots_view *view, struct wlr_box *box) {
 	assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
 	struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
 	// TODO: surf->geometry can be NULL
diff --git a/types/wlr_output.c b/types/wlr_output.c
index dd7e8d6a..d6efd9bf 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -43,7 +43,6 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
 		}
 	}
 	if (version >= WL_OUTPUT_SCALE_SINCE_VERSION) {
-		wlr_log(L_DEBUG, "Sending scale");
 		wl_output_send_scale(resource, output->scale);
 	}
 	if (version >= WL_OUTPUT_DONE_SINCE_VERSION) {
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 28f3d05b..a21be8de 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -901,9 +901,20 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
 	struct wl_resource *resource;
 	wl_resource_for_each(resource, &output->wl_resources) {
 		if (client == wl_resource_get_client(resource)) {
-			wlr_log(L_DEBUG, "sending output enter");
 			wl_surface_send_enter(surface->resource, resource);
 			break;
 		}
 	}
 }
+
+void wlr_surface_send_leave(struct wlr_surface *surface,
+		struct wlr_output *output) {
+	struct wl_client *client = wl_resource_get_client(surface->resource);
+	struct wl_resource *resource;
+	wl_resource_for_each(resource, &output->wl_resources) {
+		if (client == wl_resource_get_client(resource)) {
+			wl_surface_send_leave(surface->resource, resource);
+			break;
+		}
+	}
+}
-- 
cgit v1.2.3


From 03d3fdc15879c6fbdd24d5fe1d60f9a77402220d Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 5 Nov 2017 16:29:43 +0100
Subject: Basic maximization implementation for xdg-shell

---
 include/rootston/view.h | 12 ++++++++++++
 rootston/cursor.c       |  9 ++++++++-
 rootston/desktop.c      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 rootston/xdg_shell_v6.c | 24 +++++++++++++++++++++++-
 4 files changed, 87 insertions(+), 2 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 0913b42e..67643b94 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -48,8 +48,17 @@ enum roots_view_type {
 
 struct roots_view {
 	struct roots_desktop *desktop;
+
 	double x, y;
 	float rotation;
+
+	bool maximized;
+	struct {
+		double x, y;
+		uint32_t width, height;
+		float rotation;
+	} saved;
+
 	// TODO: Something for roots-enforced width/height
 	enum roots_view_type type;
 	union {
@@ -67,6 +76,7 @@ struct roots_view {
 #endif
 	};
 	struct wlr_surface *wlr_surface;
+
 	// TODO: This would probably be better as a field that's updated on a
 	// configure event from the xdg_shell
 	// If not then this should follow the typical type/impl pattern we use
@@ -77,6 +87,7 @@ struct roots_view {
 	void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
 	void (*move_resize)(struct roots_view *view, double x, double y,
 		uint32_t width, uint32_t height);
+	void (*maximize)(struct roots_view *view, bool maximized);
 	void (*close)(struct roots_view *view);
 };
 
@@ -86,6 +97,7 @@ void view_move(struct roots_view *view, double x, double y);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
 void view_move_resize(struct roots_view *view, double x, double y,
 	uint32_t width, uint32_t height);
+void view_maximize(struct roots_view *view, bool maximized);
 void view_close(struct roots_view *view);
 bool view_center(struct roots_view *view);
 void view_setup(struct roots_view *view);
diff --git a/rootston/cursor.c b/rootston/cursor.c
index b153e8c8..d97d518e 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -39,6 +39,8 @@ static void cursor_set_xcursor_image(struct roots_input *input,
 
 void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
 		struct roots_view *view) {
+	view_maximize(view, false);
+
 	input->mode = ROOTS_CURSOR_MOVE;
 	input->offs_x = cursor->x;
 	input->offs_y = cursor->y;
@@ -54,6 +56,8 @@ void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
 
 void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
 		struct roots_view *view, uint32_t edges) {
+	view_maximize(view, false);
+
 	input->mode = ROOTS_CURSOR_RESIZE;
 	input->offs_x = cursor->x;
 	input->offs_y = cursor->y;
@@ -74,6 +78,8 @@ void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
 
 void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor,
 		struct roots_view *view) {
+	view_maximize(view, false);
+
 	input->mode = ROOTS_CURSOR_ROTATE;
 	input->offs_x = cursor->x;
 	input->offs_y = cursor->y;
@@ -102,7 +108,8 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
 			set_compositor_cursor = view_client != input->cursor_client;
 		}
 		if (set_compositor_cursor) {
-			struct wlr_xcursor *xcursor = get_default_xcursor(input->xcursor_theme);
+			struct wlr_xcursor *xcursor =
+				get_default_xcursor(input->xcursor_theme);
 			cursor_set_xcursor_image(input, xcursor->images[0]);
 			input->cursor_client = NULL;
 		}
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 29f78ac7..f5d5925b 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -78,6 +78,50 @@ void view_move_resize(struct roots_view *view, double x, double y,
 	view_resize(view, width, height);
 }
 
+void view_maximize(struct roots_view *view, bool maximized) {
+	if (view->maximized == maximized) {
+		return;
+	}
+
+	if (view->maximize) {
+		view->maximize(view, maximized);
+	}
+
+	if (!view->maximized && maximized) {
+		struct wlr_box view_box;
+		view_get_size(view, &view_box);
+
+		view->maximized = true;
+		view->saved.x = view->x;
+		view->saved.y = view->y;
+		view->saved.rotation = view->rotation;
+		view->saved.width = view_box.width;
+		view->saved.height = view_box.height;
+
+		double output_x, output_y;
+		wlr_output_layout_closest_point(view->desktop->layout, NULL,
+			view->x + (double)view_box.width/2,
+			view->y + (double)view_box.height/2,
+			&output_x, &output_y);
+		struct wlr_output *output = wlr_output_layout_output_at(
+			view->desktop->layout, output_x, output_y);
+		struct wlr_box *output_box =
+			wlr_output_layout_get_box(view->desktop->layout, output);
+
+		view_move_resize(view, output_box->x, output_box->y, output_box->width,
+			output_box->height);
+		view->rotation = 0;
+	}
+
+	if (view->maximized && !maximized) {
+		view->maximized = false;
+
+		view_move_resize(view, view->saved.x, view->saved.y, view->saved.width,
+			view->saved.height);
+		view->rotation = view->saved.rotation;
+	}
+}
+
 void view_close(struct roots_view *view) {
 	if (view->close) {
 		view->close(view);
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index ca33c582..45691d16 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -84,6 +84,16 @@ static void move_resize(struct roots_view *view, double x, double y,
 	wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height);
 }
 
+static void maximize(struct roots_view *view, bool maximized) {
+	assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
+	struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+	if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+		return;
+	}
+
+	wlr_xdg_toplevel_v6_set_maximized(surface, maximized);
+}
+
 static void close(struct roots_view *view) {
 	assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
 	struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
@@ -119,7 +129,18 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
 }
 
 static void handle_commit(struct wl_listener *listener, void *data) {
-	// TODO is there anything we need to do here?
+	struct roots_xdg_surface_v6 *roots_xdg_surface =
+		wl_container_of(listener, roots_xdg_surface, commit);
+	struct roots_view *view = roots_xdg_surface->view;
+	struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+
+	if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+		return;
+	}
+
+	if (view->maximized != surface->toplevel_state->current.maximized) {
+		view_maximize(view, surface->toplevel_state->current.maximized);
+	}
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -178,6 +199,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	view->activate = activate;
 	view->resize = resize;
 	view->move_resize = move_resize;
+	view->maximize = maximize;
 	view->close = close;
 	view->desktop = desktop;
 	roots_surface->view = view;
-- 
cgit v1.2.3


From 2118c691b13c20d7100abfa02f9e274667501aef Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Wed, 8 Nov 2017 23:03:07 +0100
Subject: Add maximize support for xwayland in rootston

---
 include/rootston/view.h |  1 +
 rootston/xwayland.c     | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 67643b94..f6ac0d23 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -36,6 +36,7 @@ struct roots_xwayland_surface {
 	struct wl_listener request_configure;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
+	struct wl_listener request_maximize;
 	struct wl_listener map_notify;
 	struct wl_listener unmap_notify;
 };
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index e3fc1c84..431586ba 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -85,6 +85,13 @@ static void close(struct roots_view *view) {
 	wlr_xwayland_surface_close(view->desktop->xwayland, view->xwayland_surface);
 }
 
+static void maximize(struct roots_view *view, bool maximized) {
+	assert(view->type == ROOTS_XWAYLAND_VIEW);
+
+	wlr_xwayland_surface_set_maximized(view->desktop->xwayland,
+		view->xwayland_surface, maximized);
+}
+
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, destroy);
@@ -161,6 +168,17 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
 	view_begin_resize(input, cursor, view, e->edges);
 }
 
+static void handle_request_maximize(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, request_resize);
+	struct roots_view *view = roots_surface->view;
+	struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
+
+	bool maximized = xwayland_surface->maximized_vert &&
+		xwayland_surface->maximized_horz;
+	view_maximize(view, maximized);
+}
+
 static void handle_map_notify(struct wl_listener *listener, void *data) {
 	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, map_notify);
@@ -202,24 +220,24 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	if (roots_surface == NULL) {
 		return;
 	}
+
 	roots_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
-
 	roots_surface->request_configure.notify = handle_request_configure;
 	wl_signal_add(&surface->events.request_configure,
 		&roots_surface->request_configure);
-
 	roots_surface->map_notify.notify = handle_map_notify;
 	wl_signal_add(&surface->events.map_notify, &roots_surface->map_notify);
-
 	roots_surface->unmap_notify.notify = handle_unmap_notify;
 	wl_signal_add(&surface->events.unmap_notify, &roots_surface->unmap_notify);
-
 	roots_surface->request_move.notify = handle_request_move;
 	wl_signal_add(&surface->events.request_move, &roots_surface->request_move);
-
 	roots_surface->request_resize.notify = handle_request_resize;
-	wl_signal_add(&surface->events.request_resize, &roots_surface->request_resize);
+	wl_signal_add(&surface->events.request_resize,
+		&roots_surface->request_resize);
+	roots_surface->request_maximize.notify = handle_request_maximize;
+	wl_signal_add(&surface->events.request_maximize,
+		&roots_surface->request_maximize);
 
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
 	if (view == NULL) {
@@ -237,6 +255,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	view->resize = resize;
 	view->move = move;
 	view->move_resize = move_resize;
+	view->maximize = maximize;
 	view->close = close;
 	roots_surface->view = view;
 	wlr_list_add(desktop->views, view);
-- 
cgit v1.2.3


From 26dadacb7199d28af672cca3f91713e173a41258 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 9 Nov 2017 20:06:05 +0100
Subject: Add wl_shell support for maximized views

---
 include/rootston/view.h          |  3 ++-
 include/wlr/types/wlr_wl_shell.h |  2 ++
 rootston/wl_shell.c              | 28 ++++++++++++++++++++++++++++
 types/wlr_wl_shell.c             | 11 ++++-------
 xwayland/xwm.c                   |  2 --
 5 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index f6ac0d23..1b0fb831 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -11,9 +11,10 @@ struct roots_wl_shell_surface {
 
 	// TODO: Maybe destroy listener should go in roots_view
 	struct wl_listener destroy;
-	struct wl_listener ping_timeout;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
+	struct wl_listener request_set_maximized;
+	struct wl_listener set_state;
 
 	struct wl_listener surface_commit;
 };
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 4e814817..1f0630f2 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -42,6 +42,8 @@ struct wlr_wl_shell_popup_grab {
 enum wlr_wl_shell_surface_state {
 	WLR_WL_SHELL_SURFACE_STATE_NONE,
 	WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL,
+	WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED,
+	WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN,
 	WLR_WL_SHELL_SURFACE_STATE_TRANSIENT,
 	WLR_WL_SHELL_SURFACE_STATE_POPUP,
 };
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index e38eb697..3ac8fe61 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -49,6 +49,26 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
 	view_begin_resize(input, event->cursor, view, e->edges);
 }
 
+static void handle_request_set_maximized(struct wl_listener *listener,
+		void *data) {
+	struct roots_wl_shell_surface *roots_surface =
+		wl_container_of(listener, roots_surface, request_set_maximized);
+	struct roots_view *view = roots_surface->view;
+	//struct wlr_wl_shell_surface_set_maximized_event *e = data;
+	view_maximize(view, true);
+}
+
+static void handle_set_state(struct wl_listener *listener, void *data) {
+	struct roots_wl_shell_surface *roots_surface =
+		wl_container_of(listener, roots_surface, set_state);
+	struct roots_view *view = roots_surface->view;
+	struct wlr_wl_shell_surface *surface = view->wl_shell_surface;
+	if (view->maximized &&
+			surface->state != WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED) {
+		view_maximize(view, false);
+	}
+}
+
 static void handle_surface_commit(struct wl_listener *listener, void *data) {
 	// TODO do we need to do anything here?
 }
@@ -60,6 +80,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	wl_list_remove(&roots_surface->destroy.link);
 	wl_list_remove(&roots_surface->request_move.link);
 	wl_list_remove(&roots_surface->request_resize.link);
+	wl_list_remove(&roots_surface->request_set_maximized.link);
+	wl_list_remove(&roots_surface->set_state.link);
+	wl_list_remove(&roots_surface->surface_commit.link);
 	view_destroy(roots_surface->view);
 	free(roots_surface);
 }
@@ -93,6 +116,11 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	roots_surface->request_resize.notify = handle_request_resize;
 	wl_signal_add(&surface->events.request_resize,
 		&roots_surface->request_resize);
+	roots_surface->request_set_maximized.notify = handle_request_set_maximized;
+	wl_signal_add(&surface->events.request_set_maximized,
+		&roots_surface->request_set_maximized);
+	roots_surface->set_state.notify = handle_set_state;
+	wl_signal_add(&surface->events.set_state, &roots_surface->set_state);
 	roots_surface->surface_commit.notify = handle_surface_commit;
 	wl_signal_add(&surface->surface->events.commit,
 		&roots_surface->surface_commit);
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index fe61075e..f0287ba9 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -171,7 +171,6 @@ static void shell_surface_destroy_popup_state(
 	}
 }
 
-
 static void shell_surface_protocol_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, enum wl_shell_surface_resize edges) {
@@ -287,9 +286,8 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client,
 		output = wl_resource_get_user_data(output_resource);
 	}
 
-	if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) {
-		return;
-	}
+	shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN,
+		NULL, NULL);
 
 	struct wlr_wl_shell_surface_set_fullscreen_event *event =
 		calloc(1, sizeof(struct wlr_wl_shell_surface_set_fullscreen_event));
@@ -377,9 +375,8 @@ static void shell_surface_protocol_set_maximized(struct wl_client *client,
 		output = wl_resource_get_user_data(output_resource);
 	}
 
-	if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) {
-		return;
-	}
+	shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED,
+		NULL, NULL);
 
 	struct wlr_wl_shell_surface_set_maximized_event *event =
 		calloc(1, sizeof(struct wlr_wl_shell_surface_set_maximized_event));
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index e5806d5b..dff9fac2 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -839,11 +839,9 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm,
 			xsurface_set_net_wm_state(xsurface);
 		} else if (property == xwm->atoms[_NET_WM_STATE_MAXIMIZED_VERT] &&
 				update_state(action, &xsurface->maximized_vert)) {
-			wlr_log(L_DEBUG, "cc sava");
 			xsurface_set_net_wm_state(xsurface);
 		} else if (property == xwm->atoms[_NET_WM_STATE_MAXIMIZED_HORZ] &&
 				update_state(action, &xsurface->maximized_horz)) {
-			wlr_log(L_DEBUG, "mwa sava");
 			xsurface_set_net_wm_state(xsurface);
 		}
 	}
-- 
cgit v1.2.3


From bf1b12a72500fb8cb41cbc60d29e602c25c97fc2 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 9 Nov 2017 21:41:11 +0100
Subject: Fix maximize delay in xdg-shell

---
 include/rootston/view.h              |  1 +
 include/wlr/types/wlr_xdg_shell_v6.h |  2 ++
 rootston/xdg_shell_v6.c              | 19 ++++++++++++++-----
 types/wlr_xdg_shell_v6.c             |  6 ++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 1b0fb831..956ba1d3 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -27,6 +27,7 @@ struct roots_xdg_surface_v6 {
 	struct wl_listener destroy;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
+	struct wl_listener request_maximize;
 };
 
 struct roots_xwayland_surface {
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index b0de41e2..bc78428b 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -126,6 +126,8 @@ struct wlr_xdg_surface_v6 {
 		struct wl_signal ack_configure;
 		struct wl_signal ping_timeout;
 
+		struct wl_signal request_maximize;
+		struct wl_signal request_fullscreen;
 		struct wl_signal request_minimize;
 		struct wl_signal request_move;
 		struct wl_signal request_resize;
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 45691d16..a86899be 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -128,9 +128,9 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
 	view_begin_resize(input, event->cursor, view, e->edges);
 }
 
-static void handle_commit(struct wl_listener *listener, void *data) {
+static void handle_request_maximize(struct wl_listener *listener, void *data) {
 	struct roots_xdg_surface_v6 *roots_xdg_surface =
-		wl_container_of(listener, roots_xdg_surface, commit);
+		wl_container_of(listener, roots_xdg_surface, request_maximize);
 	struct roots_view *view = roots_xdg_surface->view;
 	struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
 
@@ -138,9 +138,15 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	if (view->maximized != surface->toplevel_state->current.maximized) {
-		view_maximize(view, surface->toplevel_state->current.maximized);
-	}
+	view_maximize(view, surface->toplevel_state->next.maximized);
+}
+
+static void handle_commit(struct wl_listener *listener, void *data) {
+	//struct roots_xdg_surface_v6 *roots_xdg_surface =
+	//	wl_container_of(listener, roots_xdg_surface, commit);
+	//struct roots_view *view = roots_xdg_surface->view;
+	//struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+	// TODO
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -185,6 +191,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	roots_surface->request_resize.notify = handle_request_resize;
 	wl_signal_add(&surface->events.request_resize,
 		&roots_surface->request_resize);
+	roots_surface->request_maximize.notify = handle_request_maximize;
+	wl_signal_add(&surface->events.request_maximize,
+		&roots_surface->request_maximize);
 
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
 	if (!view) {
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index fc45bc17..c260fd5e 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -667,24 +667,28 @@ static void xdg_toplevel_protocol_set_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.maximized = true;
+	wl_signal_emit(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.maximized = false;
+	wl_signal_emit(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.fullscreen = true;
+	wl_signal_emit(&surface->events.request_fullscreen, surface);
 }
 
 static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.fullscreen = false;
+	wl_signal_emit(&surface->events.request_fullscreen, surface);
 }
 
 static void xdg_toplevel_protocol_set_minimized(struct wl_client *client,
@@ -1146,6 +1150,8 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 	wl_list_init(&surface->configure_list);
 	wl_list_init(&surface->popups);
 
+	wl_signal_init(&surface->events.request_maximize);
+	wl_signal_init(&surface->events.request_fullscreen);
 	wl_signal_init(&surface->events.request_minimize);
 	wl_signal_init(&surface->events.request_move);
 	wl_signal_init(&surface->events.request_resize);
-- 
cgit v1.2.3


From eb89f1dcd2dd820bc86ae0350774aff4d81408e8 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 11 Nov 2017 15:39:15 +0100
Subject: Fix resize issues with some xdg-shell apps.

Also renames view_get_size to view_get_box to be more consistent with wlroots API and make it more obvious that x,y are set (while in roots_view.get_size this isn't the case).
Fixes #407
---
 include/rootston/view.h |  2 +-
 rootston/cursor.c       |  8 ++++----
 rootston/desktop.c      | 18 +++++++++---------
 rootston/xdg_shell_v6.c | 10 ++++++++--
 4 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'include/rootston/view.h')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index f0d102cd..99b4ed78 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -94,7 +94,7 @@ struct roots_view {
 	void (*close)(struct roots_view *view);
 };
 
-void view_get_size(const struct roots_view *view, struct wlr_box *box);
+void view_get_box(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
diff --git a/rootston/cursor.c b/rootston/cursor.c
index cbd03af1..81841b6c 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -72,10 +72,10 @@ void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
 	} else {
 		input->view_x = view->x;
 		input->view_y = view->y;
-		struct wlr_box size;
-		view_get_size(view, &size);
-		input->view_width = size.width;
-		input->view_height = size.height;
+		struct wlr_box box;
+		view_get_box(view, &box);
+		input->view_width = box.width;
+		input->view_height = box.height;
 	}
 	input->resize_edges = edges;
 
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 469a503b..0f5f5fdd 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -35,15 +35,15 @@ void view_destroy(struct roots_view *view) {
 	free(view);
 }
 
-void view_get_size(const struct roots_view *view, struct wlr_box *box) {
+void view_get_box(const struct roots_view *view, struct wlr_box *box) {
+	box->x = view->x;
+	box->y = view->y;
 	if (view->get_size) {
 		view->get_size(view, box);
 	} else {
 		box->width = view->wlr_surface->current->width;
 		box->height = view->wlr_surface->current->height;
 	}
-	box->x = view->x;
-	box->y = view->y;
 }
 
 static void view_update_output(const struct roots_view *view,
@@ -51,7 +51,7 @@ static void view_update_output(const struct roots_view *view,
 	struct roots_desktop *desktop = view->desktop;
 	struct roots_output *output;
 	struct wlr_box box;
-	view_get_size(view, &box);
+	view_get_box(view, &box);
 	wl_list_for_each(output, &desktop->outputs, link) {
 		bool intersected = before->x != -1 && wlr_output_layout_intersects(
 				desktop->layout, output->wlr_output,
@@ -71,7 +71,7 @@ static void view_update_output(const struct roots_view *view,
 
 void view_move(struct roots_view *view, double x, double y) {
 	struct wlr_box before;
-	view_get_size(view, &before);
+	view_get_box(view, &before);
 	if (view->move) {
 		view->move(view, x, y);
 	} else {
@@ -88,7 +88,7 @@ void view_activate(struct roots_view *view, bool activate) {
 
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
 	struct wlr_box before;
-	view_get_size(view, &before);
+	view_get_box(view, &before);
 	if (view->resize) {
 		view->resize(view, width, height);
 	}
@@ -117,7 +117,7 @@ void view_maximize(struct roots_view *view, bool maximized) {
 
 	if (!view->maximized && maximized) {
 		struct wlr_box view_box;
-		view_get_size(view, &view_box);
+		view_get_box(view, &view_box);
 
 		view->maximized = true;
 		view->saved.x = view->x;
@@ -158,7 +158,7 @@ void view_close(struct roots_view *view) {
 
 bool view_center(struct roots_view *view) {
 	struct wlr_box box;
-	view_get_size(view, &box);
+	view_get_box(view, &box);
 
 	struct roots_desktop *desktop = view->desktop;
 	struct wlr_cursor *cursor = desktop->server->input->cursor;
@@ -193,7 +193,7 @@ void view_setup(struct roots_view *view) {
 	view_center(view);
 	set_view_focus(input, view->desktop, view);
 	struct wlr_box before;
-	view_get_size(view, &before);
+	view_get_box(view, &before);
 	view_update_output(view, &before);
 }
 
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 2a0660a6..5e76e5d4 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -13,8 +13,14 @@
 static void get_size(const struct roots_view *view, struct wlr_box *box) {
 	assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
 	struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
-	// TODO: surf->geometry can be NULL
-	memcpy(box, surf->geometry, sizeof(struct wlr_box));
+
+	if (surf->geometry->width > 0 && surf->geometry->height > 0) {
+		box->width = surf->geometry->width;
+		box->height = surf->geometry->height;
+	} else {
+		box->width = view->wlr_surface->current->width;
+		box->height = view->wlr_surface->current->height;
+	}
 }
 
 static void activate(struct roots_view *view, bool active) {
-- 
cgit v1.2.3