From 515150229847c9ebdfd0cabb6f0026fca9d57a23 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 4 Feb 2018 13:39:10 -0500
Subject: basic focus overhaul

---
 sway/desktop/xdg_shell_v6.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index ca56a9c0..04d89015 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -135,7 +135,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy);
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *cont = new_view(seat->focus, sway_view);
+	swayc_t *focus = sway_seat_get_focus(seat, &root_container);
+	swayc_t *cont = new_view(focus, sway_view);
 	sway_view->swayc = cont;
 
 	arrange_windows(cont->parent, -1, -1);
-- 
cgit v1.2.3


From a7d49da23956c245f0e6b8f7dc9cb532eb14c4b9 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Wed, 7 Feb 2018 18:17:57 -0500
Subject: separate seat get focus and seat get focus inactive

---
 include/sway/input/seat.h   |  4 +++-
 sway/commands.c             |  4 +---
 sway/commands/workspace.c   |  2 +-
 sway/desktop/xdg_shell_v6.c |  2 +-
 sway/input/input-manager.c  |  2 +-
 sway/input/seat.c           | 32 +++++++++++++++++++-------------
 sway/tree/workspace.c       |  8 ++++----
 7 files changed, 30 insertions(+), 24 deletions(-)

(limited to 'sway/desktop')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 8d5d6b75..26a7e5dc 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -56,7 +56,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat);
 
 void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container);
 
-swayc_t *sway_seat_get_focus(struct sway_seat *seat, swayc_t *container);
+swayc_t *sway_seat_get_focus(struct sway_seat *seat);
+
+swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container);
 
 void sway_seat_set_config(struct sway_seat *seat, struct seat_config *seat_config);
 
diff --git a/sway/commands.c b/sway/commands.c
index 6bb4db0b..d8d29a1c 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -282,9 +282,7 @@ struct cmd_results *handle_command(char *_exec) {
 				}
 				if (seat) {
 					config->handler_context.current_container =
-						(seat->has_focus ?
-						 sway_seat_get_focus(seat, &root_container) :
-						 NULL);
+						sway_seat_get_focus(seat);
 					struct cmd_results *res = handler->handle(argc-1, argv+1);
 					if (res->status != CMD_SUCCESS) {
 						free_argv(argc, argv);
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index e7d6cc9f..fa891398 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -91,7 +91,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 		}
 		workspace_switch(ws);
 		current_container =
-			sway_seat_get_focus(config->handler_context.seat, &root_container);
+			sway_seat_get_focus(config->handler_context.seat);
 		swayc_t *new_output = swayc_parent_by_type(current_container, C_OUTPUT);
 
 		if (config->mouse_warping && old_output != new_output) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 04d89015..b44d9e54 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -135,7 +135,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy);
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	swayc_t *cont = new_view(focus, sway_view);
 	sway_view->swayc = cont;
 
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index a406636e..90eb8cf6 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -282,7 +282,7 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
 		swayc_t *container) {
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &input->seats, link) {
-		if (seat->has_focus && sway_seat_get_focus(seat, &root_container) == container) {
+		if (sway_seat_get_focus(seat) == container) {
 			return true;
 		}
 	}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index cbf05abd..d2ffca64 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -137,16 +137,14 @@ static void seat_configure_keyboard(struct sway_seat *seat,
 	struct wlr_keyboard *wlr_keyboard = seat_device->input_device->wlr_device->keyboard;
 	sway_keyboard_configure(seat_device->keyboard);
 	wlr_seat_set_keyboard(seat->wlr_seat,
-		seat_device->input_device->wlr_device);
-	if (seat->has_focus) {
-		swayc_t *focus = sway_seat_get_focus(seat, &root_container);
-		if (focus && focus->type == C_VIEW) {
-			// force notify reenter to pick up the new configuration
-			wlr_seat_keyboard_clear_focus(seat->wlr_seat);
-			wlr_seat_keyboard_notify_enter(seat->wlr_seat,
-					focus->sway_view->surface, wlr_keyboard->keycodes,
-					wlr_keyboard->num_keycodes, &wlr_keyboard->modifiers);
-		}
+			seat_device->input_device->wlr_device);
+	swayc_t *focus = sway_seat_get_focus(seat);
+	if (focus && focus->type == C_VIEW) {
+		// force notify reenter to pick up the new configuration
+		wlr_seat_keyboard_clear_focus(seat->wlr_seat);
+		wlr_seat_keyboard_notify_enter(seat->wlr_seat,
+				focus->sway_view->surface, wlr_keyboard->keycodes,
+				wlr_keyboard->num_keycodes, &wlr_keyboard->modifiers);
 	}
 }
 
@@ -266,12 +264,13 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
 static void handle_focus_destroy(struct wl_listener *listener, void *data) {
 	struct sway_seat *seat = wl_container_of(listener, seat, focus_destroy);
 	swayc_t *container = data;
+	// TODO dont set focus to the parent, set focus to the next focus inactive
+	// of the parent
 	sway_seat_set_focus(seat, container->parent);
 }
 
 void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
-	swayc_t *last_focus =
-		(seat->has_focus ? sway_seat_get_focus(seat, &root_container) : NULL);
+	swayc_t *last_focus = sway_seat_get_focus(seat);
 
 	if (container && last_focus == container) {
 		return;
@@ -314,7 +313,7 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
 	}
 }
 
-swayc_t *sway_seat_get_focus(struct sway_seat *seat, swayc_t *container) {
+swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container) {
 	struct sway_seat_container *current = NULL;
 	swayc_t *parent = NULL;
 	wl_list_for_each(current, &seat->focus_stack, link) {
@@ -338,6 +337,13 @@ swayc_t *sway_seat_get_focus(struct sway_seat *seat, swayc_t *container) {
 	return NULL;
 }
 
+swayc_t *sway_seat_get_focus(struct sway_seat *seat) {
+	if (!seat->has_focus) {
+		return NULL;
+	}
+	return sway_seat_get_focus_inactive(seat, &root_container);
+}
+
 void sway_seat_set_config(struct sway_seat *seat,
 		struct seat_config *seat_config) {
 	// clear configs
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index ce5b425c..29f07f74 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -63,8 +63,8 @@ static bool _workspace_by_name(swayc_t *view, void *data) {
 swayc_t *workspace_by_name(const char *name) {
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 	swayc_t *current_workspace = NULL, *current_output = NULL;
-	if (seat->has_focus) {
-		swayc_t *focus = sway_seat_get_focus(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus(seat);
+	if (focus) {
 		current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
 		current_output = swayc_parent_by_type(focus, C_OUTPUT);
 	}
@@ -103,7 +103,7 @@ swayc_t *workspace_create(const char *name) {
 	}
 	// Otherwise create a new one
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
 	parent = swayc_parent_by_type(parent, C_OUTPUT);
 	return new_workspace(parent, name);
@@ -195,7 +195,7 @@ bool workspace_switch(swayc_t *workspace) {
 		return false;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	if (!seat || !focus) {
 		return false;
 	}
-- 
cgit v1.2.3


From 095ddb1561001f21b812dbe0daa5e06bc688ed98 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 10 Feb 2018 15:49:07 -0500
Subject: fix build for output damage

---
 sway/desktop/output.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index a650665f..6b6d727a 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -125,8 +125,9 @@ static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface,
 	double width = surface->surface->current->width;
 	double height = surface->surface->current->height;
 
-	struct wlr_xdg_surface_v6 *popup;
-	wl_list_for_each(popup, &surface->popups, popup_link) {
+	struct wlr_xdg_popup_v6 *popup_state;
+	wl_list_for_each(popup_state, &surface->popups, link) {
+		struct wlr_xdg_surface_v6 *popup = popup_state->base;
 		if (!popup->configured) {
 			continue;
 		}
@@ -216,7 +217,12 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	struct wlr_output *wlr_output = data;
 	struct sway_server *server = soutput->server;
 
-	wlr_output_make_current(wlr_output);
+	float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
+	struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+	wlr_renderer_clear(renderer, &clear_color);
+
+	int buffer_age = -1;
+	wlr_output_make_current(wlr_output, &buffer_age);
 	wlr_renderer_begin(server->renderer, wlr_output);
 
 	swayc_t *workspace = soutput->swayc->focused;
@@ -236,7 +242,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	}
 
 	wlr_renderer_end(server->renderer);
-	wlr_output_swap_buffers(wlr_output);
+	wlr_output_swap_buffers(wlr_output, &soutput->last_frame, NULL);
 
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
-- 
cgit v1.2.3


From 93084c9cf80901b160e0eb50b72a8e607289a678 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 10 Feb 2018 19:53:50 -0500
Subject: remove old focus member

---
 include/sway/container.h |  4 ----
 sway/desktop/output.c    |  7 ++++++-
 sway/ipc-json.c          |  4 ++--
 sway/tree/container.c    |  1 -
 sway/tree/layout.c       |  5 -----
 sway/tree/workspace.c    | 20 +++++++++++---------
 6 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'sway/desktop')

diff --git a/include/sway/container.h b/include/sway/container.h
index 01e166ad..48363be6 100644
--- a/include/sway/container.h
+++ b/include/sway/container.h
@@ -106,10 +106,6 @@ struct sway_container {
 	 * The parent of this container. NULL for the root container.
 	 */
 	struct sway_container *parent;
-	/**
-	 * Which of this container's children has focus.
-	 */
-	struct sway_container *focused;
 
 	/**
 	 * Number of master views in auto layouts.
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 6b6d727a..6bbaf938 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -225,7 +225,12 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	wlr_output_make_current(wlr_output, &buffer_age);
 	wlr_renderer_begin(server->renderer, wlr_output);
 
-	swayc_t *workspace = soutput->swayc->focused;
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc);
+	swayc_t *workspace = (focus->type == C_WORKSPACE ?
+			focus :
+			swayc_parent_by_type(focus, C_WORKSPACE));
+
 	swayc_descendants_of_type(workspace, C_VIEW, output_frame_view, soutput);
 
 	// render unmanaged views on top
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index bab9a201..f0afdc9f 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -74,8 +74,8 @@ static void ipc_json_describe_output(swayc_t *container, json_object *object) {
 	json_object_object_add(object, "refresh", json_object_new_int(wlr_output->refresh));
 	json_object_object_add(object, "transform",
 		json_object_new_string(ipc_json_get_output_transform(wlr_output->transform)));
-	json_object_object_add(object, "current_workspace",
-		(container->focused) ? json_object_new_string(container->focused->name) : NULL);
+	// TODO WLR need to set "current_workspace" to the currently focused
+	// workspace in a way that makes sense with multiseat
 }
 
 static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) {
diff --git a/sway/tree/container.c b/sway/tree/container.c
index ebf9f98e..d1fb7a79 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -151,7 +151,6 @@ swayc_t *new_output(struct sway_output *sway_output) {
 	char *ws_name = workspace_next_name(output->name);
 	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
 	swayc_t *ws = new_workspace(output, ws_name);
-	output->focused = ws;
 	// Set each seat's focus if not already set
 	// TODO FOCUS: this is probably stupid, we shouldn't define focus in two
 	// places. We should probably put the active workspace on the sway_output
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 16d5cbc5..3651d279 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -84,8 +84,6 @@ swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
 	int i = index_child(fixed);
 	list_insert(parent->children, i + 1, active);
 	active->parent = parent;
-	// focus new child
-	parent->focused = active;
 	return active->parent;
 }
 
@@ -96,9 +94,6 @@ void add_child(swayc_t *parent, swayc_t *child) {
 	list_add(parent->children, child);
 	child->parent = parent;
 	// set focus for this container
-	if (!parent->focused) {
-		parent->focused = child;
-	}
 	/* TODO WLR
 	if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
 		child = new_container(child, parent->workspace_layout);
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 29f07f74..861fda4d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -120,9 +120,15 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
 		return NULL;
 	}
 
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
+	swayc_t *workspace = (focus->type == C_WORKSPACE ?
+			focus :
+			swayc_parent_by_type(focus, C_WORKSPACE));
+
 	int i;
 	for (i = 0; i < output->children->length; i++) {
-		if (output->children->items[i] == output->focused) {
+		if (output->children->items[i] == workspace) {
 			return output->children->items[
 				wrap(i + (next ? 1 : -1), output->children->length)];
 		}
@@ -225,16 +231,12 @@ bool workspace_switch(swayc_t *workspace) {
 	// TODO: Deal with sticky containers
 
 	wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
-	// TODO FOCUS: Focus the last view this seat had focused on this workspace
-	if (workspace->children->length) {
-		// TODO FOCUS: This is really fucking stupid
-		sway_seat_set_focus(seat, workspace->children->items[0]);
-	} else {
-		sway_seat_set_focus(seat, workspace);
+	swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
+	if (next == NULL) {
+		next = workspace;
 	}
+	sway_seat_set_focus(seat, next);
 	swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
-	// TODO FOCUS: take a look at this
-	output->focused = workspace;
 	arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From 7dfbf06de9a5659d4c73edf53c38ee07068a2877 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Wed, 14 Feb 2018 14:51:51 -0500
Subject: output destroy

---
 include/sway/output.h |  1 +
 include/sway/server.h |  7 +++----
 sway/desktop/output.c | 12 +++++++-----
 sway/server.c         |  8 ++------
 sway/tree/container.c |  2 ++
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'sway/desktop')

diff --git a/include/sway/output.h b/include/sway/output.h
index 7ca02d7b..95d64705 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -14,6 +14,7 @@ struct sway_output {
 	struct timespec last_frame;
 
 	struct wl_listener frame;
+	struct wl_listener output_destroy;
 };
 
 #endif
diff --git a/include/sway/server.h b/include/sway/server.h
index d497e132..1600babe 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -24,8 +24,7 @@ struct sway_server {
 
 	struct sway_input_manager *input;
 
-	struct wl_listener output_add;
-	struct wl_listener output_remove;
+	struct wl_listener new_output;
 	struct wl_listener output_frame;
 
 	struct wlr_xdg_shell_v6 *xdg_shell_v6;
@@ -45,8 +44,8 @@ bool server_init(struct sway_server *server);
 void server_fini(struct sway_server *server);
 void server_run(struct sway_server *server);
 
-void output_add_notify(struct wl_listener *listener, void *data);
-void output_remove_notify(struct wl_listener *listener, void *data);
+void handle_new_output(struct wl_listener *listener, void *data);
+void handle_output_destroy(struct wl_listener *listener, void *data);
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index a650665f..16183870 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -243,8 +243,8 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	soutput->last_frame = now;
 }
 
-void output_add_notify(struct wl_listener *listener, void *data) {
-	struct sway_server *server = wl_container_of(listener, server, output_add);
+void handle_new_output(struct wl_listener *listener, void *data) {
+	struct sway_server *server = wl_container_of(listener, server, new_output);
 	struct wlr_output *wlr_output = data;
 	wlr_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
 
@@ -269,12 +269,14 @@ void output_add_notify(struct wl_listener *listener, void *data) {
 
 	sway_input_manager_configure_xcursor(input_manager);
 
-	output->frame.notify = output_frame_notify;
 	wl_signal_add(&wlr_output->events.frame, &output->frame);
+	output->frame.notify = output_frame_notify;
+
+	wl_signal_add(&wlr_output->events.destroy, &output->output_destroy);
+	output->output_destroy.notify = handle_output_destroy;
 }
 
-void output_remove_notify(struct wl_listener *listener, void *data) {
-	struct sway_server *server = wl_container_of(listener, server, output_remove);
+void handle_output_destroy(struct wl_listener *listener, void *data) {
 	struct wlr_output *wlr_output = data;
 	wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
 
diff --git a/sway/server.c b/sway/server.c
index b5eb510b..0753d37e 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -48,12 +48,8 @@ bool server_init(struct sway_server *server) {
 	server->data_device_manager =
 		wlr_data_device_manager_create(server->wl_display);
 
-	server->output_add.notify = output_add_notify;
-	wl_signal_add(&server->backend->events.output_add, &server->output_add);
-
-	server->output_remove.notify = output_remove_notify;
-	wl_signal_add(&server->backend->events.output_remove,
-			&server->output_remove);
+	server->new_output.notify = handle_new_output;
+	wl_signal_add(&server->backend->events.new_output, &server->new_output);
 
 	server->xdg_shell_v6 = wlr_xdg_shell_v6_create(server->wl_display);
 	wl_signal_add(&server->xdg_shell_v6->events.new_surface,
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 48aabd86..1a468c19 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -235,6 +235,8 @@ swayc_t *destroy_output(swayc_t *output) {
 		}
 	}
 
+	wl_list_remove(&output->sway_output->output_destroy.link);
+
 	wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
 	free_swayc(output);
 
-- 
cgit v1.2.3


From c6cb87be19dba185e32af59e1e7fd1217a15c08b Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Wed, 14 Feb 2018 14:55:38 -0500
Subject: output damage fix

---
 sway/desktop/output.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 16183870..a66601b5 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -125,8 +125,9 @@ static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface,
 	double width = surface->surface->current->width;
 	double height = surface->surface->current->height;
 
-	struct wlr_xdg_surface_v6 *popup;
-	wl_list_for_each(popup, &surface->popups, popup_link) {
+	struct wlr_xdg_popup_v6 *popup_state;
+	wl_list_for_each(popup_state, &surface->popups, link) {
+		struct wlr_xdg_surface_v6 *popup = popup_state->base;
 		if (!popup->configured) {
 			continue;
 		}
@@ -215,8 +216,13 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	struct sway_output *soutput = wl_container_of(listener, soutput, frame);
 	struct wlr_output *wlr_output = data;
 	struct sway_server *server = soutput->server;
+	float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
+	struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+	wlr_renderer_clear(renderer, &clear_color);
 
-	wlr_output_make_current(wlr_output);
+	int buffer_age = -1;
+	wlr_output_make_current(wlr_output, &buffer_age);
+ 	wlr_renderer_begin(server->renderer, wlr_output);
 	wlr_renderer_begin(server->renderer, wlr_output);
 
 	swayc_t *workspace = soutput->swayc->focused;
@@ -236,7 +242,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	}
 
 	wlr_renderer_end(server->renderer);
-	wlr_output_swap_buffers(wlr_output);
+	wlr_output_swap_buffers(wlr_output, &soutput->last_frame, NULL);
 
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
-- 
cgit v1.2.3


From 9510a20fcda00eecf077cc5cb06f5d47d87bccee Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 17 Feb 2018 13:32:04 -0500
Subject: arrange windows after output add

---
 sway/desktop/output.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index e250d450..ba282c2c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -286,6 +286,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 
 	wl_signal_add(&wlr_output->events.destroy, &output->output_destroy);
 	output->output_destroy.notify = handle_output_destroy;
+
+	arrange_windows(&root_container, -1, -1);
 }
 
 void handle_output_destroy(struct wl_listener *listener, void *data) {
-- 
cgit v1.2.3


From 7c089442c3c9877eec2422780f6ce57315de2d11 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 17 Feb 2018 15:18:21 -0500
Subject: use box projection function

---
 sway/desktop/output.c | 43 +------------------------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index ba282c2c..7b7fcbb9 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -57,46 +57,7 @@ static void render_surface(struct wlr_surface *surface,
 	};
 	if (wlr_output_layout_intersects(layout, wlr_output, &render_box)) {
 		float matrix[16];
-
-		float translate_center[16];
-		wlr_matrix_translate(&translate_center,
-			(int)ox + render_width / 2, (int)oy + render_height / 2, 0);
-
-		float rotate[16];
-		wlr_matrix_rotate(&rotate, rotation);
-
-		float translate_origin[16];
-		wlr_matrix_translate(&translate_origin, -render_width / 2,
-			-render_height / 2, 0);
-
-		float scale[16];
-		wlr_matrix_scale(&scale, render_width, render_height, 1);
-
-		float transform[16];
-		wlr_matrix_mul(&translate_center, &rotate, &transform);
-		wlr_matrix_mul(&transform, &translate_origin, &transform);
-		wlr_matrix_mul(&transform, &scale, &transform);
-
-		if (surface->current->transform != WL_OUTPUT_TRANSFORM_NORMAL) {
-			float surface_translate_center[16];
-			wlr_matrix_translate(&surface_translate_center, 0.5, 0.5, 0);
-
-			float surface_transform[16];
-			wlr_matrix_transform(surface_transform,
-				wlr_output_transform_invert(surface->current->transform));
-
-			float surface_translate_origin[16];
-			wlr_matrix_translate(&surface_translate_origin, -0.5, -0.5, 0);
-
-			wlr_matrix_mul(&transform, &surface_translate_center,
-				&transform);
-			wlr_matrix_mul(&transform, &surface_transform, &transform);
-			wlr_matrix_mul(&transform, &surface_translate_origin,
-				&transform);
-		}
-
-		wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix);
-
+		wlr_matrix_project_box(&matrix, &render_box, surface->current->transform, 0, &wlr_output->transform_matrix);
 		wlr_render_with_matrix(server.renderer, surface->texture,
 			&matrix);
 
@@ -220,8 +181,6 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
 	wlr_renderer_clear(renderer, &clear_color);
 
-	wlr_renderer_clear(renderer, &clear_color);
-
 	int buffer_age = -1;
 	wlr_output_make_current(wlr_output, &buffer_age);
 	wlr_renderer_begin(server->renderer, wlr_output);
-- 
cgit v1.2.3


From 80927985fbb40e0bdf2a3c4322d808a9681cca6a Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 17 Feb 2018 16:30:32 -0500
Subject: fix output rendering issue

---
 sway/desktop/output.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 7b7fcbb9..a3d9efd8 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -46,18 +46,22 @@ static void render_surface(struct wlr_surface *surface,
 	int height = surface->current->height;
 	int render_width = width * wlr_output->scale;
 	int render_height = height * wlr_output->scale;
-	double ox = lx, oy = ly;
-	wlr_output_layout_output_coords(layout, wlr_output, &ox, &oy);
-	ox *= wlr_output->scale;
-	oy *= wlr_output->scale;
+	int owidth, oheight;
+	wlr_output_effective_resolution(wlr_output, &owidth, &oheight);
 
-	struct wlr_box render_box = {
-		.x = lx, .y = ly,
+	// FIXME: view coords are inconsistently assumed to be in output or layout coords
+	struct wlr_box layout_box = {
+		.x = lx + owidth, .y = ly + oheight,
 		.width = render_width, .height = render_height,
 	};
-	if (wlr_output_layout_intersects(layout, wlr_output, &render_box)) {
+	if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {
+		struct wlr_box render_box = {
+			.x = lx, .y = ly,
+			.width = render_width, .height = render_height
+		};
 		float matrix[16];
-		wlr_matrix_project_box(&matrix, &render_box, surface->current->transform, 0, &wlr_output->transform_matrix);
+		wlr_matrix_project_box(&matrix, &render_box,
+				surface->current->transform, 0, &wlr_output->transform_matrix);
 		wlr_render_with_matrix(server.renderer, surface->texture,
 			&matrix);
 
-- 
cgit v1.2.3


From b88f06e70a62722e70855772dcfa5b20b3a10291 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Mon, 19 Feb 2018 17:55:16 -0500
Subject: bugfix: get right layout box for rendering views

---
 sway/desktop/output.c | 2 +-
 sway/tree/layout.c    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index a3d9efd8..039aba25 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -51,7 +51,7 @@ static void render_surface(struct wlr_surface *surface,
 
 	// FIXME: view coords are inconsistently assumed to be in output or layout coords
 	struct wlr_box layout_box = {
-		.x = lx + owidth, .y = ly + oheight,
+		.x = lx + wlr_output->lx, .y = ly + wlr_output->ly,
 		.width = render_width, .height = render_height,
 	};
 	if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index be494791..3c78b6bc 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -531,7 +531,10 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 				return wrap_candidate;
 			}
 			swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
-			if (next->children->length) {
+			if (next == NULL) {
+				return NULL;
+			}
+			if (next->children && next->children->length) {
 				// TODO consider floating children as well
 				return sway_seat_get_focus_inactive(seat, next);
 			} else {
-- 
cgit v1.2.3


From 316effd7b1f6b60f70038f9a5df5d58eb879cf90 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 20 Feb 2018 19:06:56 -0500
Subject: make handle_output_destroy() static

---
 include/sway/server.h |  1 -
 sway/desktop/output.c | 40 ++++++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'sway/desktop')

diff --git a/include/sway/server.h b/include/sway/server.h
index 1600babe..3fcdb1ba 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -45,7 +45,6 @@ void server_fini(struct sway_server *server);
 void server_run(struct sway_server *server);
 
 void handle_new_output(struct wl_listener *listener, void *data);
-void handle_output_destroy(struct wl_listener *listener, void *data);
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 039aba25..8e0daeea 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -218,6 +218,26 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	soutput->last_frame = now;
 }
 
+static void handle_output_destroy(struct wl_listener *listener, void *data) {
+	struct wlr_output *wlr_output = data;
+	wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
+
+	swayc_t *output_container = NULL;
+	for (int i = 0 ; i < root_container.children->length; ++i) {
+		swayc_t *child = root_container.children->items[i];
+		if (child->type == C_OUTPUT &&
+				child->sway_output->wlr_output == wlr_output) {
+			output_container = child;
+			break;
+		}
+	}
+	if (!output_container) {
+		return;
+	}
+
+	destroy_output(output_container);
+}
+
 void handle_new_output(struct wl_listener *listener, void *data) {
 	struct sway_server *server = wl_container_of(listener, server, new_output);
 	struct wlr_output *wlr_output = data;
@@ -252,23 +272,3 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 
 	arrange_windows(&root_container, -1, -1);
 }
-
-void handle_output_destroy(struct wl_listener *listener, void *data) {
-	struct wlr_output *wlr_output = data;
-	wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
-
-	swayc_t *output_container = NULL;
-	for (int i = 0 ; i < root_container.children->length; ++i) {
-		swayc_t *child = root_container.children->items[i];
-		if (child->type == C_OUTPUT &&
-				child->sway_output->wlr_output == wlr_output) {
-			output_container = child;
-			break;
-		}
-	}
-	if (!output_container) {
-		return;
-	}
-
-	destroy_output(output_container);
-}
-- 
cgit v1.2.3


From 23e9f5dc350b8d1f399ffe2e5b761f21dc9c46a8 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 20 Feb 2018 19:21:32 -0500
Subject: use wl_container_of() in output destroy callback

---
 sway/desktop/output.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 8e0daeea..63420d0c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -219,23 +219,11 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 }
 
 static void handle_output_destroy(struct wl_listener *listener, void *data) {
+	struct sway_output *output = wl_container_of(listener, output, output_destroy);
 	struct wlr_output *wlr_output = data;
 	wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
 
-	swayc_t *output_container = NULL;
-	for (int i = 0 ; i < root_container.children->length; ++i) {
-		swayc_t *child = root_container.children->items[i];
-		if (child->type == C_OUTPUT &&
-				child->sway_output->wlr_output == wlr_output) {
-			output_container = child;
-			break;
-		}
-	}
-	if (!output_container) {
-		return;
-	}
-
-	destroy_output(output_container);
+	destroy_output(output->swayc);
 }
 
 void handle_new_output(struct wl_listener *listener, void *data) {
-- 
cgit v1.2.3