From 1e4807efa0647b2d856a4c8e9b23aff35625d1d8 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 2 Jul 2018 22:16:20 +1000
Subject: Don't return pending children in seat_get_active_current_child

Fixes #2192.

seat_get_active_current_child is intended to return a child of the given
container which has finished its mapping transaction and is able to be
rendered on screen. The previous implementation was capable of returning
a pending child, which caused a child of a tabbed or stacked view to be
rendered prematurely while it was mapping.
---
 sway/input/seat.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 2c2087da..a934d4a8 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -832,12 +832,12 @@ struct sway_container *seat_get_active_child(struct sway_seat *seat,
 
 struct sway_container *seat_get_active_current_child(struct sway_seat *seat,
 		struct sway_container *container) {
-	struct sway_container *child = seat_get_active_child(seat, container);
-	if (child) {
-		return child;
-	}
-	if (container->current.children->length == 1) {
-		return container->current.children->items[0];
+	struct sway_seat_container *current = NULL;
+	wl_list_for_each(current, &seat->focus_stack, link) {
+		if (current->container->current.parent == container &&
+				current->container->current.layout != L_FLOATING) {
+			return current->container;
+		}
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 0bd41a0daecfb2da34ea52f6a46b9fc0d162a47a Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 4 Jul 2018 15:38:08 +1000
Subject: Fix focus related damage

When you have an unfocused container (so one view is focused_inactive),
and you focus any other view in that container, the view with
focused_inactive was not damaged. This is because we damaged the
previous focus and new focus, but needed to damage the parent of the new
focus.
---
 sway/input/seat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index a934d4a8..6c5abcd8 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -663,7 +663,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 
 		seat_send_focus(container, seat);
-		container_damage_whole(container);
+		container_damage_whole(container->parent);
 	}
 
 	// clean up unfocused empty workspace on new output
-- 
cgit v1.2.3


From 8a771785ad9026b12f0b23e89c69cafecbc3b752 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 4 Jul 2018 15:10:23 +0900
Subject: keyboard: free xkb keymap on destroy

---
 sway/input/keyboard.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index ec149d06..182536de 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -420,6 +420,9 @@ void sway_keyboard_destroy(struct sway_keyboard *keyboard) {
 	if (!keyboard) {
 		return;
 	}
+	if (keyboard->keymap) {
+		xkb_keymap_unref(keyboard->keymap);
+	}
 	wl_list_remove(&keyboard->keyboard_key.link);
 	wl_list_remove(&keyboard->keyboard_modifiers.link);
 	free(keyboard);
-- 
cgit v1.2.3


From c833ae64bc1d1561cc71e68dcd2d2bd909aac538 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Thu, 5 Jul 2018 23:01:35 -0400
Subject: Fix pointer button events for layer surfaces

---
 sway/input/cursor.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 944e35aa..a2f11557 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -255,14 +255,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 			wlr_layer_surface_from_wlr_surface(surface);
 		if (layer->current.keyboard_interactive) {
 			seat_set_focus_layer(cursor->seat, layer);
-			return;
 		}
-	}
-	// Avoid moving keyboard focus from a surface that accepts it to one
-	// that does not unless the change would move us to a new workspace.
-	//
-	// This prevents, for example, losing focus when clicking on swaybar.
-	if (surface && cont && cont->type != C_VIEW) {
+	} else if (surface && cont && cont->type != C_VIEW) {
+		// Avoid moving keyboard focus from a surface that accepts it to one
+		// that does not unless the change would move us to a new workspace.
+		//
+		// This prevents, for example, losing focus when clicking on swaybar.
 		struct sway_container *new_ws = cont;
 		if (new_ws && new_ws->type != C_WORKSPACE) {
 			new_ws = container_parent(new_ws, C_WORKSPACE);
-- 
cgit v1.2.3


From f63b209d51bab84aacb001adfd443c7f4c9a8cfe Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Fri, 6 Jul 2018 14:13:45 +0100
Subject: Attach destroy handler earlier

This prevents it from being bypassed when the device has no seat configuration
---
 sway/input/input-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 29b47a7b..98f7d7cf 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -224,6 +224,9 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 		input_manager_libinput_config_pointer(input_device);
 	}
 
+	wl_signal_add(&device->events.destroy, &input_device->device_destroy);
+	input_device->device_destroy.notify = handle_device_destroy;
+
 	struct sway_seat *seat = NULL;
 	if (!input_has_seat_configuration(input)) {
 		wlr_log(L_DEBUG, "no seat configuration, using default seat");
@@ -260,9 +263,6 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 			"device '%s' is not configured on any seats",
 			input_device->identifier);
 	}
-
-	wl_signal_add(&device->events.destroy, &input_device->device_destroy);
-	input_device->device_destroy.notify = handle_device_destroy;
 }
 
 static void handle_inhibit_activate(struct wl_listener *listener, void *data) {
-- 
cgit v1.2.3


From 63b4bf500020cf35cebfdce2d73f8e359ff495c2 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 9 Jul 2018 22:54:30 +0100
Subject: Update for swaywm/wlroots#1126

---
 sway/input/cursor.c        |  2 +-
 sway/input/input-manager.c | 38 +++++++++++++++++++-------------------
 sway/input/keyboard.c      |  8 ++++----
 sway/input/seat.c          | 22 +++++++++++-----------
 4 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index a2f11557..307eedd4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -474,7 +474,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 	// TODO: check cursor mode
 	if (focused_client == NULL ||
 			event->seat_client->client != focused_client) {
-		wlr_log(L_DEBUG, "denying request to set cursor from unfocused client");
+		wlr_log(WLR_DEBUG, "denying request to set cursor from unfocused client");
 		return;
 	}
 
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 98f7d7cf..daaf1fb6 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -61,7 +61,7 @@ static char *get_device_identifier(struct wlr_input_device *device) {
 	int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
 	char *identifier = malloc(len);
 	if (!identifier) {
-		wlr_log(L_ERROR, "Unable to allocate unique input device name");
+		wlr_log(WLR_ERROR, "Unable to allocate unique input device name");
 		return NULL;
 	}
 
@@ -104,74 +104,74 @@ static void input_manager_libinput_config_pointer(
 	}
 
 	libinput_device = wlr_libinput_get_device_handle(wlr_device);
-	wlr_log(L_DEBUG, "input_manager_libinput_config_pointer(%s)",
+	wlr_log(WLR_DEBUG, "input_manager_libinput_config_pointer(%s)",
 		ic->identifier);
 
 	if (ic->accel_profile != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
 			ic->identifier, ic->accel_profile);
 		libinput_device_config_accel_set_profile(libinput_device,
 			ic->accel_profile);
 	}
 	if (ic->click_method != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
 			ic->identifier, ic->click_method);
 		libinput_device_config_click_set_method(libinput_device,
 			ic->click_method);
 	}
 	if (ic->drag_lock != INT_MIN) {
-		wlr_log(L_DEBUG,
+		wlr_log(WLR_DEBUG,
 			"libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
 			ic->identifier, ic->click_method);
 		libinput_device_config_tap_set_drag_lock_enabled(libinput_device,
 			ic->drag_lock);
 	}
 	if (ic->dwt != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
 			ic->identifier, ic->dwt);
 		libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
 	}
 	if (ic->left_handed != INT_MIN) {
-		wlr_log(L_DEBUG,
+		wlr_log(WLR_DEBUG,
 			"libinput_config_pointer(%s) left_handed_set_enabled(%d)",
 			ic->identifier, ic->left_handed);
 		libinput_device_config_left_handed_set(libinput_device,
 			ic->left_handed);
 	}
 	if (ic->middle_emulation != INT_MIN) {
-		wlr_log(L_DEBUG,
+		wlr_log(WLR_DEBUG,
 			"libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
 			ic->identifier, ic->middle_emulation);
 		libinput_device_config_middle_emulation_set_enabled(libinput_device,
 			ic->middle_emulation);
 	}
 	if (ic->natural_scroll != INT_MIN) {
-		wlr_log(L_DEBUG,
+		wlr_log(WLR_DEBUG,
 			"libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
 			ic->identifier, ic->natural_scroll);
 		libinput_device_config_scroll_set_natural_scroll_enabled(
 			libinput_device, ic->natural_scroll);
 	}
 	if (ic->pointer_accel != FLT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
 			ic->identifier, ic->pointer_accel);
 		libinput_device_config_accel_set_speed(libinput_device,
 			ic->pointer_accel);
 	}
 	if (ic->scroll_method != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
 			ic->identifier, ic->scroll_method);
 		libinput_device_config_scroll_set_method(libinput_device,
 			ic->scroll_method);
 	}
 	if (ic->send_events != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
 			ic->identifier, ic->send_events);
 		libinput_device_config_send_events_set_mode(libinput_device,
 			ic->send_events);
 	}
 	if (ic->tap != INT_MIN) {
-		wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
 			ic->identifier, ic->tap);
 		libinput_device_config_tap_set_enabled(libinput_device, ic->tap);
 	}
@@ -187,7 +187,7 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	wlr_log(L_DEBUG, "removing device: '%s'",
+	wlr_log(WLR_DEBUG, "removing device: '%s'",
 		input_device->identifier);
 
 	struct sway_seat *seat = NULL;
@@ -217,7 +217,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 	input_device->identifier = get_device_identifier(device);
 	wl_list_insert(&input->devices, &input_device->link);
 
-	wlr_log(L_DEBUG, "adding device: '%s'",
+	wlr_log(WLR_DEBUG, "adding device: '%s'",
 		input_device->identifier);
 
 	if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
@@ -229,7 +229,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 
 	struct sway_seat *seat = NULL;
 	if (!input_has_seat_configuration(input)) {
-		wlr_log(L_DEBUG, "no seat configuration, using default seat");
+		wlr_log(WLR_DEBUG, "no seat configuration, using default seat");
 		seat = input_manager_get_seat(input, default_seat);
 		seat_add_device(seat, input_device);
 		return;
@@ -259,7 +259,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 	}
 
 	if (!added) {
-		wlr_log(L_DEBUG,
+		wlr_log(WLR_DEBUG,
 			"device '%s' is not configured on any seats",
 			input_device->identifier);
 	}
@@ -282,7 +282,7 @@ static void handle_inhibit_deactivate(struct wl_listener *listener, void *data)
 		seat_set_exclusive_client(seat, NULL);
 		struct sway_container *previous = seat_get_focus(seat);
 		if (previous) {
-			wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
+			wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous,
 					container_type_to_str(previous->type), previous->name);
 			// Hack to get seat to re-focus the return value of get_focus
 			seat_set_focus(seat, previous->parent);
@@ -359,7 +359,7 @@ void input_manager_apply_input_config(struct sway_input_manager *input,
 
 void input_manager_apply_seat_config(struct sway_input_manager *input,
 		struct seat_config *seat_config) {
-	wlr_log(L_DEBUG, "applying new seat config for seat %s",
+	wlr_log(WLR_DEBUG, "applying new seat config for seat %s",
 		seat_config->name);
 	struct sway_seat *seat = input_manager_get_seat(input, seat_config->name);
 	if (!seat) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 182536de..580c0d4b 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -108,7 +108,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
 		}
 
 		if (*current_binding && *current_binding != binding) {
-			wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d",
+			wlr_log(WLR_DEBUG, "encountered duplicate bindings %d and %d",
 					(*current_binding)->order, binding->order);
 		} else {
 			*current_binding = binding;
@@ -122,12 +122,12 @@ static void get_active_binding(const struct sway_shortcut_state *state,
  */
 static void keyboard_execute_command(struct sway_keyboard *keyboard,
 		struct sway_binding *binding) {
-	wlr_log(L_DEBUG, "running command for binding: %s",
+	wlr_log(WLR_DEBUG, "running command for binding: %s",
 		binding->command);
 	config->handler_context.seat = keyboard->seat_device->sway_seat;
 	struct cmd_results *results = execute_command(binding->command, NULL);
 	if (results->status != CMD_SUCCESS) {
-		wlr_log(L_DEBUG, "could not run command for binding: %s (%s)",
+		wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)",
 			binding->command, results->error);
 	}
 	free_cmd_results(results);
@@ -386,7 +386,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
 		xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
 
 	if (!keymap) {
-		wlr_log(L_DEBUG, "cannot configure keyboard: keymap does not exist");
+		wlr_log(WLR_DEBUG, "cannot configure keyboard: keymap does not exist");
 		xkb_context_unref(context);
 		return;
 	}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 6c5abcd8..5dadb31d 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -75,7 +75,7 @@ static void seat_send_activate(struct sway_container *con,
 		struct sway_seat *seat) {
 	if (con->type == C_VIEW) {
 		if (!seat_is_input_allowed(seat, con->sway_view->surface)) {
-			wlr_log(L_DEBUG, "Refusing to set focus, input is inhibited");
+			wlr_log(WLR_DEBUG, "Refusing to set focus, input is inhibited");
 			return;
 		}
 		view_set_activated(con->sway_view, true);
@@ -219,7 +219,7 @@ static struct sway_seat_container *seat_container_from_container(
 
 	seat_con = calloc(1, sizeof(struct sway_seat_container));
 	if (seat_con == NULL) {
-		wlr_log(L_ERROR, "could not allocate seat container");
+		wlr_log(WLR_ERROR, "could not allocate seat container");
 		return NULL;
 	}
 
@@ -301,7 +301,7 @@ static void handle_new_drag_icon(struct wl_listener *listener, void *data) {
 
 	struct sway_drag_icon *icon = calloc(1, sizeof(struct sway_drag_icon));
 	if (icon == NULL) {
-		wlr_log(L_ERROR, "Allocation failed");
+		wlr_log(WLR_ERROR, "Allocation failed");
 		return;
 	}
 	icon->seat = seat;
@@ -391,7 +391,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
 	struct input_config *ic = input_device_get_config(
 			sway_device->input_device);
 	if (ic != NULL) {
-		wlr_log(L_DEBUG, "Applying input config to %s",
+		wlr_log(WLR_DEBUG, "Applying input config to %s",
 			sway_device->input_device->identifier);
 
 		mapped_to_output = ic->mapped_to_output;
@@ -401,7 +401,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
 		mapped_to_output = sway_device->input_device->wlr_device->output_name;
 	}
 	if (mapped_to_output != NULL) {
-		wlr_log(L_DEBUG, "Mapping input device %s to output %s",
+		wlr_log(WLR_DEBUG, "Mapping input device %s to output %s",
 			sway_device->input_device->identifier, mapped_to_output);
 		struct sway_container *output = NULL;
 		for (int i = 0; i < root_container.children->length; ++i) {
@@ -415,7 +415,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
 			wlr_cursor_map_input_to_output(seat->cursor->cursor,
 				sway_device->input_device->wlr_device,
 				output->sway_output->wlr_output);
-			wlr_log(L_DEBUG, "Mapped to output %s", output->name);
+			wlr_log(WLR_DEBUG, "Mapped to output %s", output->name);
 		}
 	}
 }
@@ -495,7 +495,7 @@ void seat_configure_device(struct sway_seat *seat,
 			seat_configure_tablet_tool(seat, seat_device);
 			break;
 		case WLR_INPUT_DEVICE_TABLET_PAD:
-			wlr_log(L_DEBUG, "TODO: configure tablet pad");
+			wlr_log(WLR_DEBUG, "TODO: configure tablet pad");
 			break;
 	}
 }
@@ -510,11 +510,11 @@ void seat_add_device(struct sway_seat *seat,
 	struct sway_seat_device *seat_device =
 		calloc(1, sizeof(struct sway_seat_device));
 	if (!seat_device) {
-		wlr_log(L_DEBUG, "could not allocate seat device");
+		wlr_log(WLR_DEBUG, "could not allocate seat device");
 		return;
 	}
 
-	wlr_log(L_DEBUG, "adding device %s to seat %s",
+	wlr_log(WLR_DEBUG, "adding device %s to seat %s",
 		input_device->identifier, seat->wlr_seat->name);
 
 	seat_device->sway_seat = seat;
@@ -533,7 +533,7 @@ void seat_remove_device(struct sway_seat *seat,
 		return;
 	}
 
-	wlr_log(L_DEBUG, "removing device %s from seat %s",
+	wlr_log(WLR_DEBUG, "removing device %s from seat %s",
 		input_device->identifier, seat->wlr_seat->name);
 
 	seat_device_destroy(seat_device);
@@ -752,7 +752,7 @@ void seat_set_focus_layer(struct sway_seat *seat,
 		struct sway_container *previous =
 			seat_get_focus_inactive(seat, &root_container);
 		if (previous) {
-			wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
+			wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous,
 					container_type_to_str(previous->type), previous->name);
 			// Hack to get seat to re-focus the return value of get_focus
 			seat_set_focus(seat, previous->parent);
-- 
cgit v1.2.3


From 15dc5286e280ddd06e845dc57115243e72f2339e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 11 Jul 2018 19:50:02 +1000
Subject: Move floating windows to front when focused

---
 sway/input/seat.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 5dadb31d..bf4e8876 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -666,6 +666,14 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		container_damage_whole(container->parent);
 	}
 
+	// If we've focused a floating container, bring it to the front.
+	// We do this by putting it at the end of the floating list.
+	// This must happen for both the pending and current children lists.
+	if (container_is_floating(container)) {
+		list_move_to_end(container->parent->children, container);
+		list_move_to_end(container->parent->current.children, container);
+	}
+
 	// clean up unfocused empty workspace on new output
 	if (new_output_last_ws) {
 		if (!workspace_is_visible(new_output_last_ws)
-- 
cgit v1.2.3


From 600c1261509b5849562b7e2238c1363c9950ac35 Mon Sep 17 00:00:00 2001
From: dudemanguy <random342@airmail.cc>
Date: Wed, 11 Jul 2018 10:08:33 -0500
Subject: fix crash on floating windows

---
 sway/input/seat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index bf4e8876..be37258f 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -671,7 +671,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
 	// This must happen for both the pending and current children lists.
 	if (container_is_floating(container)) {
 		list_move_to_end(container->parent->children, container);
-		list_move_to_end(container->parent->current.children, container);
+		if (container_has_ancestor(container, container->current.parent)) {
+			list_move_to_end(container->parent->current.children, container);
+		}
 	}
 
 	// clean up unfocused empty workspace on new output
-- 
cgit v1.2.3


From 41b80c28dfafb9bc13b68e4d5d2811d311b59863 Mon Sep 17 00:00:00 2001
From: Robert Kubosz <kubosz.robert@gmail.com>
Date: Wed, 11 Jul 2018 22:03:06 +0200
Subject: add scroll button option

This commit introduces a scroll_button option, which is intended to be
used with scroll_method. Now user can edit his sway config and add an
scroll_button option to device section.
---
 sway/input/input-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index daaf1fb6..b18989d0 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -158,6 +158,12 @@ static void input_manager_libinput_config_pointer(
 		libinput_device_config_accel_set_speed(libinput_device,
 			ic->pointer_accel);
 	}
+	if (ic->scroll_button != INT_MIN) {
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)",
+			ic->identifier, ic->scroll_button);
+		libinput_device_config_scroll_set_button(libinput_device,
+			ic->scroll_button);
+	}
 	if (ic->scroll_method != INT_MIN) {
 		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
 			ic->identifier, ic->scroll_method);
-- 
cgit v1.2.3


From ee0e1b170ec1fce2c92a495293ff8aced83b0cb1 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 12 Jul 2018 14:43:08 +1000
Subject: Fix crash in seat code

Container will be NULL if launching swaylock.
---
 sway/input/seat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index be37258f..5e65ca70 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -669,7 +669,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 	// If we've focused a floating container, bring it to the front.
 	// We do this by putting it at the end of the floating list.
 	// This must happen for both the pending and current children lists.
-	if (container_is_floating(container)) {
+	if (container && container_is_floating(container)) {
 		list_move_to_end(container->parent->children, container);
 		if (container_has_ancestor(container, container->current.parent)) {
 			list_move_to_end(container->parent->current.children, container);
-- 
cgit v1.2.3


From 13c6627ddb7dbe235426e123ee6ff8e6794bda6d Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Sat, 14 Jul 2018 01:01:47 -0400
Subject: Implement tap_button_map for input devices

---
 sway/input/input-manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index b18989d0..0b7cb766 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -181,6 +181,12 @@ static void input_manager_libinput_config_pointer(
 			ic->identifier, ic->tap);
 		libinput_device_config_tap_set_enabled(libinput_device, ic->tap);
 	}
+	if (ic->tap_button_map != INT_MIN) {
+		wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_button_map(%d)",
+			ic->identifier, ic->tap);
+		libinput_device_config_tap_set_button_map(libinput_device,
+			ic->tap_button_map);
+	}
 }
 
 static void handle_device_destroy(struct wl_listener *listener, void *data) {
-- 
cgit v1.2.3


From a120d4c79f9406a2f7cc38c60069d3183c98ea87 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 15 Jul 2018 15:20:21 +1000
Subject: Make focus part of transactions

Rather than maintain copies of the entire focus stack, this PR
transactionises the focus by introducing two new properties to the
container state and using those when rendering.

* `bool focused` means this container has actual focus. Only one
container should have this equalling true in its current state.
* `struct sway_container *focus_inactive_child` points to the immediate
child that was most recently focused (eg. for tabbed and stacked
containers).
---
 sway/input/cursor.c   |  3 +++
 sway/input/keyboard.c |  2 ++
 sway/input/seat.c     | 24 ++++++------------------
 3 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 307eedd4..7a9f3ed7 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -10,6 +10,7 @@
 #include <wlr/types/wlr_idle.h>
 #include "list.h"
 #include "log.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/layers.h"
 #include "sway/output.h"
@@ -219,6 +220,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		struct sway_drag_icon *drag_icon = wlr_drag_icon->data;
 		drag_icon_update_position(drag_icon);
 	}
+	transaction_commit_dirty();
 }
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
@@ -278,6 +280,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 
 	wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
 			time_msec, button, state);
+	transaction_commit_dirty();
 }
 
 static void handle_cursor_button(struct wl_listener *listener, void *data) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 580c0d4b..ede38519 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -3,6 +3,7 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_idle.h>
+#include "sway/desktop/transaction.h"
 #include "sway/input/seat.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/input-manager.h"
@@ -126,6 +127,7 @@ static void keyboard_execute_command(struct sway_keyboard *keyboard,
 		binding->command);
 	config->handler_context.seat = keyboard->seat_device->sway_seat;
 	struct cmd_results *results = execute_command(binding->command, NULL);
+	transaction_commit_dirty();
 	if (results->status != CMD_SUCCESS) {
 		wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)",
 			binding->command, results->error);
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 5e65ca70..74f1375e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -661,9 +661,13 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		if (last_focus) {
 			seat_send_unfocus(last_focus, seat);
 		}
-
 		seat_send_focus(container, seat);
-		container_damage_whole(container->parent);
+
+		container_set_dirty(container);
+		container_set_dirty(container->parent); // for focused_inactive_child
+		if (last_focus) {
+			container_set_dirty(last_focus);
+		}
 	}
 
 	// If we've focused a floating container, bring it to the front.
@@ -717,10 +721,6 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 	}
 
-	if (last_focus) {
-		container_damage_whole(last_focus);
-	}
-
 	if (last_workspace && last_workspace != new_workspace) {
 		cursor_send_pointer_motion(seat->cursor, 0, true);
 	}
@@ -840,18 +840,6 @@ struct sway_container *seat_get_active_child(struct sway_seat *seat,
 	return NULL;
 }
 
-struct sway_container *seat_get_active_current_child(struct sway_seat *seat,
-		struct sway_container *container) {
-	struct sway_seat_container *current = NULL;
-	wl_list_for_each(current, &seat->focus_stack, link) {
-		if (current->container->current.parent == container &&
-				current->container->current.layout != L_FLOATING) {
-			return current->container;
-		}
-	}
-	return NULL;
-}
-
 struct sway_container *seat_get_focus(struct sway_seat *seat) {
 	if (!seat->has_focus) {
 		return NULL;
-- 
cgit v1.2.3


From 315d5311b2004b9e148e7b52a7de161b6dfe3878 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 15 Jul 2018 22:43:33 +1000
Subject: Implement urgency base functionality

Introduces a command to manually set urgency, as well as rendering of
urgent views, sending the IPC event, removing urgency after focused for
one second, and matching urgent views via criteria.
---
 sway/input/seat.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 74f1375e..7058cc92 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -594,6 +594,12 @@ static void seat_send_unfocus(struct sway_container *container,
 	}
 }
 
+static int handle_urgent_timeout(void *data) {
+	struct sway_view *view = data;
+	view_set_urgent(view, false);
+	return 0;
+}
+
 void seat_set_focus_warp(struct sway_seat *seat,
 		struct sway_container *container, bool warp) {
 	if (seat->focused_layer) {
@@ -670,6 +676,16 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 	}
 
+	// If urgent, start a timer to unset it
+	if (container && container->type == C_VIEW &&
+			view_is_urgent(container->sway_view) &&
+			!container->sway_view->urgent_timer) {
+		struct sway_view *view = container->sway_view;
+		view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
+				handle_urgent_timeout, view);
+		wl_event_source_timer_update(view->urgent_timer, 1000);
+	}
+
 	// If we've focused a floating container, bring it to the front.
 	// We do this by putting it at the end of the floating list.
 	// This must happen for both the pending and current children lists.
-- 
cgit v1.2.3


From 9ca5cb7fafcea3671107eebc1a9fd6d46b1ffd9e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Jul 2018 18:09:35 +1000
Subject: Fix tab split focus bug

Fixes a bug where if you have a tab containing a split, then switch from
a non-split tab to the split tab, focus is not changed properly.
---
 sway/input/seat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 74f1375e..85321dbe 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -649,6 +649,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		while (parent) {
 			wl_list_remove(&parent->link);
 			wl_list_insert(&seat->focus_stack, &parent->link);
+			container_set_dirty(parent->container);
 
 			parent =
 				seat_container_from_container(seat,
-- 
cgit v1.2.3


From 03d49490ccff3c5c81bea73622c8616fa61eb3dd Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Tue, 17 Jul 2018 23:04:55 +0100
Subject: Update cursor on focus change

This allows to send wl_pointer.enter when switching between views
in a split/tabbed layout for instance. This (1) updates the cursor
image accordingly (2) makes it unnecessary to move the mouse before
scrolling. It's harmless to always call cursor_send_pointer_motion
because in case the focused surface hasn't changed this is a no-op.

The `last_focus != NULL` condition is required otherwise
cursor_send_pointer_motion will crash when sway starts up (the
sway_output doesn't yet have a workspace).
---
 sway/input/seat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 12b1fab5..8ed4a3fe 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -738,7 +738,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 	}
 
-	if (last_workspace && last_workspace != new_workspace) {
+	if (last_focus != NULL) {
 		cursor_send_pointer_motion(seat->cursor, 0, true);
 	}
 
-- 
cgit v1.2.3


From 747725b8bb35bf3fd38d442f5bb565e7a4b11ec4 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Wed, 18 Jul 2018 20:00:48 +0100
Subject: Don't unfocus when an override redirect window is mapped

---
 sway/input/seat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 8ed4a3fe..eadf3b26 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -753,11 +753,11 @@ void seat_set_focus(struct sway_seat *seat,
 }
 
 void seat_set_focus_surface(struct sway_seat *seat,
-		struct wlr_surface *surface) {
+		struct wlr_surface *surface, bool unfocus) {
 	if (seat->focused_layer != NULL) {
 		return;
 	}
-	if (seat->has_focus) {
+	if (seat->has_focus && unfocus) {
 		struct sway_container *focus = seat_get_focus(seat);
 		seat_send_unfocus(focus, seat);
 		seat->has_focus = false;
@@ -789,7 +789,7 @@ void seat_set_focus_layer(struct sway_seat *seat,
 	} else if (!layer || seat->focused_layer == layer) {
 		return;
 	}
-	seat_set_focus_surface(seat, layer->surface);
+	seat_set_focus_surface(seat, layer->surface, true);
 	if (layer->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
 		seat->focused_layer = layer;
 	}
-- 
cgit v1.2.3


From 8533c35a9f15288bb9bade57d972cf0ad0724ec4 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 19:49:50 +1000
Subject: Fix crash and render issues involving cursor_send_pointer_motion

Fixes #2303, as well as a crash.

To replicate the crash:

* Have multiple outputs
* In config: for_window [<criteria>] workspace foo
* Also in config: workspace foo output <left-output-name>
* Focus the right output, and ensure workspace foo doesn't exist
* Launch the app that triggers the criteria

When the view maps, it calls workspace_switch which calls
send_set_focus which calls cursor_send_pointer_motion which calls
transaction_commit_dirty. This call to transaction_commit_dirty is not
meant to happen at this time because the tree isn't guaranteed to be in
a consistent state, but I'm not sure how exactly this leads to the crash
or render issues.

In this case the transaction is already committed by the view
implementation's handle_map function. So the solution is to remove it
from cursor_send_pointer_motion and add it to the other functions in
cursor.c which call cursor_send_pointer_motion.
---
 sway/input/cursor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7a9f3ed7..c76c20b3 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -220,7 +220,6 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		struct sway_drag_icon *drag_icon = wlr_drag_icon->data;
 		drag_icon_update_position(drag_icon);
 	}
-	transaction_commit_dirty();
 }
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
@@ -230,6 +229,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
 	wlr_cursor_move(cursor->cursor, event->device,
 		event->delta_x, event->delta_y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 static void handle_cursor_motion_absolute(
@@ -240,6 +240,7 @@ static void handle_cursor_motion_absolute(
 	struct wlr_event_pointer_motion_absolute *event = data;
 	wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -426,6 +427,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
 
 	wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 static void handle_tool_tip(struct wl_listener *listener, void *data) {
-- 
cgit v1.2.3


From c2ed3d8bd6e2ec12f2ce70d7e106c09a7078e91f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Jul 2018 19:37:27 +1000
Subject: Implement force_display_urgency_hint

The directive sets the timeout before an urgent view becomes normal
again after switching to it from another workspace.

Also:

* When an xwayland surface removes the urgent hint while the timer is
active, we now ignore the request. This happens as soon as the view
receives focus, so it was effectively making the timer pointless.
* The timeout is now only applied when switching to it from another
workspace.
---
 sway/input/seat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index eadf3b26..816429d3 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -679,12 +679,14 @@ void seat_set_focus_warp(struct sway_seat *seat,
 
 	// If urgent, start a timer to unset it
 	if (container && container->type == C_VIEW &&
+			last_workspace && last_workspace != new_workspace &&
 			view_is_urgent(container->sway_view) &&
+			config->urgent_timeout > 0 &&
 			!container->sway_view->urgent_timer) {
 		struct sway_view *view = container->sway_view;
 		view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
 				handle_urgent_timeout, view);
-		wl_event_source_timer_update(view->urgent_timer, 1000);
+		wl_event_source_timer_update(view->urgent_timer, config->urgent_timeout);
 	}
 
 	// If we've focused a floating container, bring it to the front.
-- 
cgit v1.2.3


From 37b33f92e8cd94984c4e3c8c851f5dfdacbe14f5 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 10:27:40 +1000
Subject: Fix urgent timer logic and remove unnecessary header includes

---
 sway/input/seat.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 816429d3..e77d88a8 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -677,16 +677,20 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 	}
 
-	// If urgent, start a timer to unset it
+	// If urgent, either unset the urgency or start a timer to unset it
 	if (container && container->type == C_VIEW &&
-			last_workspace && last_workspace != new_workspace &&
 			view_is_urgent(container->sway_view) &&
-			config->urgent_timeout > 0 &&
 			!container->sway_view->urgent_timer) {
 		struct sway_view *view = container->sway_view;
-		view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
-				handle_urgent_timeout, view);
-		wl_event_source_timer_update(view->urgent_timer, config->urgent_timeout);
+		if (last_workspace && last_workspace != new_workspace &&
+				config->urgent_timeout > 0) {
+			view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
+					handle_urgent_timeout, view);
+			wl_event_source_timer_update(view->urgent_timer,
+					config->urgent_timeout);
+		} else {
+			view_set_urgent(view, false);
+		}
 	}
 
 	// If we've focused a floating container, bring it to the front.
-- 
cgit v1.2.3


From 9fbe13b9be18c732b58033a57a22a299af91a170 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Jul 2018 16:13:28 +1000
Subject: Implement floating_modifier and mouse operations for floating views

This implements the following:

* `floating_modifier` configuration directive
* Drag a floating window by its title bar
* Hold mod + drag a floating window from anywhere
* Resize a floating view by dragging the border
* Resize a floating view by holding mod and right clicking anywhere on
the view
* Resize a floating view and keep aspect ratio by holding shift while
resizing using either method
* Mouse cursor turns into resize when hovering floating border or corner
---
 sway/input/cursor.c | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 311 insertions(+), 11 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index c76c20b3..6ad214b5 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -5,15 +5,19 @@
 #elif __FreeBSD__
 #include <dev/evdev/input-event-codes.h>
 #endif
+#include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_idle.h>
 #include "list.h"
 #include "log.h"
+#include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
+#include "sway/input/keyboard.h"
 #include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
@@ -127,7 +131,7 @@ static struct sway_container *container_at_coords(
 		return ws;
 	}
 
-	c = seat_get_focus_inactive(seat, output->swayc);
+	c = seat_get_active_child(seat, output->swayc);
 	if (c) {
 		return c;
 	}
@@ -139,6 +143,173 @@ static struct sway_container *container_at_coords(
 	return output->swayc;
 }
 
+static enum resize_edge find_resize_edge(struct sway_container *cont,
+		struct sway_cursor *cursor) {
+	if (cont->type != C_VIEW) {
+		return RESIZE_EDGE_NONE;
+	}
+	struct sway_view *view = cont->sway_view;
+	if (view->border == B_NONE || !view->border_thickness || view->using_csd) {
+		return RESIZE_EDGE_NONE;
+	}
+
+	enum resize_edge edge = 0;
+	if (cursor->cursor->x < cont->x + view->border_thickness) {
+		edge |= RESIZE_EDGE_LEFT;
+	}
+	if (cursor->cursor->y < cont->y + view->border_thickness) {
+		edge |= RESIZE_EDGE_TOP;
+	}
+	if (cursor->cursor->x >= cont->x + cont->width - view->border_thickness) {
+		edge |= RESIZE_EDGE_RIGHT;
+	}
+	if (cursor->cursor->y >= cont->y + cont->height - view->border_thickness) {
+		edge |= RESIZE_EDGE_BOTTOM;
+	}
+	return edge;
+}
+
+static void handle_drag_motion(struct sway_seat *seat,
+		struct sway_cursor *cursor) {
+	struct sway_container *con = seat->op_container;
+	desktop_damage_whole_container(con);
+	container_floating_translate(con,
+			cursor->cursor->x - cursor->previous.x,
+			cursor->cursor->y - cursor->previous.y);
+	desktop_damage_whole_container(con);
+}
+
+static void calculate_floating_constraints(struct sway_container *con,
+		int *min_width, int *max_width, int *min_height, int *max_height) {
+	if (config->floating_minimum_width == -1) { // no minimum
+		*min_width = 0;
+	} else if (config->floating_minimum_width == 0) { // automatic
+		*min_width = 75;
+	} else {
+		*min_width = config->floating_minimum_width;
+	}
+
+	if (config->floating_minimum_height == -1) { // no minimum
+		*min_height = 0;
+	} else if (config->floating_minimum_height == 0) { // automatic
+		*min_height = 50;
+	} else {
+		*min_height = config->floating_minimum_height;
+	}
+
+	if (config->floating_maximum_width == -1) { // no maximum
+		*max_width = INT_MAX;
+	} else if (config->floating_maximum_width == 0) { // automatic
+		struct sway_container *ws = container_parent(con, C_WORKSPACE);
+		*max_width = ws->width;
+	} else {
+		*max_width = config->floating_maximum_width;
+	}
+
+	if (config->floating_maximum_height == -1) { // no maximum
+		*max_height = INT_MAX;
+	} else if (config->floating_maximum_height == 0) { // automatic
+		struct sway_container *ws = container_parent(con, C_WORKSPACE);
+		*max_height = ws->height;
+	} else {
+		*max_height = config->floating_maximum_height;
+	}
+}
+static void handle_resize_motion(struct sway_seat *seat,
+		struct sway_cursor *cursor) {
+	struct sway_container *con = seat->op_container;
+	double center_lx = con->x + con->width / 2;
+	double center_ly = con->y + con->height / 2;
+	enum resize_edge edge = seat->op_resize_edge;
+
+	// The amount the mouse has moved since the start of the resize operation
+	// Positive is down/right
+	double mouse_move_x = cursor->cursor->x - seat->op_ref_lx;
+	double mouse_move_y = cursor->cursor->y - seat->op_ref_ly;
+
+	if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) {
+		mouse_move_x = 0;
+	}
+	if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) {
+		mouse_move_y = 0;
+	}
+
+	double grow_width = seat->op_ref_lx > center_lx ?
+		mouse_move_x : -mouse_move_x;
+	double grow_height = seat->op_ref_ly > center_ly ?
+		mouse_move_y : -mouse_move_y;
+
+	if (seat->op_resize_preserve_ratio) {
+		double x_multiplier = grow_width / seat->op_ref_width;
+		double y_multiplier = grow_height / seat->op_ref_height;
+		double avg_multiplier = (x_multiplier + y_multiplier) / 2;
+		grow_width = seat->op_ref_width * avg_multiplier;
+		grow_height = seat->op_ref_height * avg_multiplier;
+	}
+
+	// If we're resizing from the center (mod + right click), we need to double
+	// the amount we're growing because we're doing it in both directions.
+	if (edge == RESIZE_EDGE_NONE) {
+		grow_width *= 2;
+		grow_height *= 2;
+	}
+
+	// Determine new width/height, and accommodate for min/max values
+	double width = seat->op_ref_width + grow_width;
+	double height = seat->op_ref_height + grow_height;
+	int min_width, max_width, min_height, max_height;
+	calculate_floating_constraints(con, &min_width, &max_width,
+			&min_height, &max_height);
+	width = fmax(min_width, fmin(width, max_width));
+	height = fmax(min_height, fmin(height, max_height));
+
+	// Recalculate these, in case we hit a min/max limit
+	grow_width = width - seat->op_ref_width;
+	grow_height = height - seat->op_ref_height;
+
+	// Determine grow x/y values - these are relative to the container's x/y at
+	// the start of the resize operation.
+	double grow_x = 0, grow_y = 0;
+	if (edge & RESIZE_EDGE_LEFT) {
+		grow_x = -grow_width;
+	} else if (edge & RESIZE_EDGE_RIGHT) {
+		grow_x = 0;
+	} else {
+		grow_x = -grow_width / 2;
+	}
+	if (edge & RESIZE_EDGE_TOP) {
+		grow_y = -grow_height;
+	} else if (edge & RESIZE_EDGE_BOTTOM) {
+		grow_y = 0;
+	} else {
+		grow_y = -grow_height / 2;
+	}
+
+	// Determine the amounts we need to bump everything relative to the current
+	// size.
+	int relative_grow_width = width - con->width;
+	int relative_grow_height = height - con->height;
+	int relative_grow_x = (seat->op_ref_con_lx + grow_x) - con->x;
+	int relative_grow_y = (seat->op_ref_con_ly + grow_y) - con->y;
+
+	// Actually resize stuff
+	con->x += relative_grow_x;
+	con->y += relative_grow_y;
+	con->width += relative_grow_width;
+	con->height += relative_grow_height;
+
+	if (con->type == C_VIEW) {
+		struct sway_view *view = con->sway_view;
+		view->x += relative_grow_x;
+		view->y += relative_grow_y;
+		view->width += relative_grow_width;
+		view->height += relative_grow_height;
+	}
+
+	arrange_windows(con);
+	transaction_commit_dirty();
+}
+
 void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		bool allow_refocusing) {
 	if (time_msec == 0) {
@@ -146,6 +317,18 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 	}
 
 	struct sway_seat *seat = cursor->seat;
+
+	if (seat->operation != OP_NONE) {
+		if (seat->operation == OP_DRAG) {
+			handle_drag_motion(seat, cursor);
+		} else {
+			handle_resize_motion(seat, cursor);
+		}
+		cursor->previous.x = cursor->cursor->x;
+		cursor->previous.y = cursor->cursor->y;
+		return;
+	}
+
 	struct wlr_seat *wlr_seat = seat->wlr_seat;
 	struct wlr_surface *surface = NULL;
 	double sx, sy;
@@ -194,15 +377,54 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		}
 	}
 
-	// reset cursor if switching between clients
-	struct wl_client *client = NULL;
-	if (surface != NULL) {
-		client = wl_resource_get_client(surface->resource);
-	}
-	if (client != cursor->image_client) {
+	// Handle cursor image
+	if (surface) {
+		// Reset cursor if switching between clients
+		struct wl_client *client = wl_resource_get_client(surface->resource);
+		if (client != cursor->image_client) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"left_ptr", cursor->cursor);
+			cursor->image_client = client;
+		}
+	} else if (c && container_is_floating(c)) {
+		// Try a floating container's resize edge
+		enum resize_edge edge = find_resize_edge(c, cursor);
+		if (edge == RESIZE_EDGE_NONE) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"left_ptr", cursor->cursor);
+		} else if (edge == RESIZE_EDGE_TOP) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"top_side", cursor->cursor);
+		} else if (edge == RESIZE_EDGE_RIGHT) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"right_side", cursor->cursor);
+		} else if (edge == RESIZE_EDGE_BOTTOM) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"bottom_side", cursor->cursor);
+		} else if (edge == RESIZE_EDGE_LEFT) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"left_side", cursor->cursor);
+		} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_LEFT)) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"top_left_corner", cursor->cursor);
+		} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_RIGHT)) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"top_right_corner", cursor->cursor);
+		} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_LEFT)) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"bottom_left_corner", cursor->cursor);
+		} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT)) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"bottom_right_corner", cursor->cursor);
+		} else {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+					"left_ptr", cursor->cursor);
+		}
+		cursor->image_client = NULL;
+	} else {
 		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-			"left_ptr", cursor->cursor);
-		cursor->image_client = client;
+				"left_ptr", cursor->cursor);
+		cursor->image_client = NULL;
 	}
 
 	// send pointer enter/leave
@@ -243,8 +465,79 @@ static void handle_cursor_motion_absolute(
 	transaction_commit_dirty();
 }
 
+static void handle_end_operation(struct sway_seat *seat) {
+	if (seat->operation == OP_DRAG) {
+		// We "move" the container to its own location so it discovers its
+		// output again.
+		struct sway_container *con = seat->op_container;
+		container_floating_move_to(con, con->x, con->y);
+		seat->operation = OP_NONE;
+		seat->op_container = NULL;
+	} else {
+		// OP_RESIZE
+		seat->operation = OP_NONE;
+		seat->op_container = NULL;
+	}
+}
+
+static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
+		uint32_t time_msec, uint32_t button, enum wlr_button_state state,
+		struct wlr_surface *surface, double sx, double sy,
+		struct sway_container *cont) {
+	struct sway_seat *seat = cursor->seat;
+
+	// Deny dragging or resizing a fullscreen view
+	if (cont->type == C_VIEW && cont->sway_view->is_fullscreen) {
+		wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
+		return;
+	}
+
+	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
+	bool mod_pressed = keyboard &&
+		(keyboard->modifiers.depressed & config->floating_mod);
+	enum resize_edge edge = find_resize_edge(cont, cursor);
+	bool over_title = edge == RESIZE_EDGE_NONE && !surface;
+
+	// Check for beginning drag
+	if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED &&
+			(mod_pressed || over_title)) {
+		seat->operation = OP_DRAG;
+		seat->op_container = cont;
+		seat->op_button = button;
+		return;
+	}
+
+	// Check for beginning resize
+	bool resizing_via_border = button == BTN_LEFT && edge;
+	bool resizing_via_mod = button == BTN_RIGHT && mod_pressed;
+	if ((resizing_via_border || resizing_via_mod) &&
+			state == WLR_BUTTON_PRESSED) {
+		seat->operation = OP_RESIZE;
+		seat->op_container = cont;
+		seat->op_resize_preserve_ratio = keyboard &&
+			(keyboard->modifiers.depressed & 1); // Shift
+		seat->op_resize_edge = edge;
+		seat->op_button = button;
+		seat->op_ref_lx = cursor->cursor->x;
+		seat->op_ref_ly = cursor->cursor->y;
+		seat->op_ref_con_lx = cont->x;
+		seat->op_ref_con_ly = cont->y;
+		seat->op_ref_width = cont->width;
+		seat->op_ref_height = cont->height;
+		return;
+	}
+
+	// Send event to surface
+	wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
+}
+
 void dispatch_cursor_button(struct sway_cursor *cursor,
 		uint32_t time_msec, uint32_t button, enum wlr_button_state state) {
+	if (cursor->seat->operation != OP_NONE &&
+			button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) {
+		handle_end_operation(cursor->seat);
+		return;
+	}
 	if (time_msec == 0) {
 		time_msec = get_current_time_msec();
 	}
@@ -259,6 +552,11 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		if (layer->current.keyboard_interactive) {
 			seat_set_focus_layer(cursor->seat, layer);
 		}
+		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
+				time_msec, button, state);
+	} else if (cont && container_is_floating(cont)) {
+		dispatch_cursor_button_floating(cursor, time_msec, button, state,
+				surface, sx, sy, cont);
 	} else if (surface && cont && cont->type != C_VIEW) {
 		// Avoid moving keyboard focus from a surface that accepts it to one
 		// that does not unless the change would move us to a new workspace.
@@ -275,12 +573,14 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		if (new_ws != old_ws) {
 			seat_set_focus(cursor->seat, cont);
 		}
+		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
+				time_msec, button, state);
 	} else if (cont) {
 		seat_set_focus(cursor->seat, cont);
+		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
+				time_msec, button, state);
 	}
 
-	wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
-			time_msec, button, state);
 	transaction_commit_dirty();
 }
 
-- 
cgit v1.2.3


From 3aadf944ae0ad08439d2651d37eb3c6c686d2709 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Jul 2018 17:40:53 +1000
Subject: Use WLR_MODIFIER_SHIFT

---
 sway/input/cursor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 6ad214b5..3c27a7f6 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -515,7 +515,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 		seat->operation = OP_RESIZE;
 		seat->op_container = cont;
 		seat->op_resize_preserve_ratio = keyboard &&
-			(keyboard->modifiers.depressed & 1); // Shift
+			(keyboard->modifiers.depressed & WLR_MODIFIER_SHIFT);
 		seat->op_resize_edge = edge;
 		seat->op_button = button;
 		seat->op_ref_lx = cursor->cursor->x;
-- 
cgit v1.2.3


From 2c6616050a924a356b9bebbe16c9c7b8661b5d80 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 13:17:20 +1000
Subject: Make mod + resize do it from the top left corner

---
 sway/input/cursor.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 3c27a7f6..e5631f5b 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -218,8 +218,6 @@ static void calculate_floating_constraints(struct sway_container *con,
 static void handle_resize_motion(struct sway_seat *seat,
 		struct sway_cursor *cursor) {
 	struct sway_container *con = seat->op_container;
-	double center_lx = con->x + con->width / 2;
-	double center_ly = con->y + con->height / 2;
 	enum resize_edge edge = seat->op_resize_edge;
 
 	// The amount the mouse has moved since the start of the resize operation
@@ -234,10 +232,8 @@ static void handle_resize_motion(struct sway_seat *seat,
 		mouse_move_y = 0;
 	}
 
-	double grow_width = seat->op_ref_lx > center_lx ?
-		mouse_move_x : -mouse_move_x;
-	double grow_height = seat->op_ref_ly > center_ly ?
-		mouse_move_y : -mouse_move_y;
+	double grow_width = edge & RESIZE_EDGE_LEFT ? -mouse_move_x : mouse_move_x;
+	double grow_height = edge & RESIZE_EDGE_TOP ? -mouse_move_y : mouse_move_y;
 
 	if (seat->op_resize_preserve_ratio) {
 		double x_multiplier = grow_width / seat->op_ref_width;
@@ -247,13 +243,6 @@ static void handle_resize_motion(struct sway_seat *seat,
 		grow_height = seat->op_ref_height * avg_multiplier;
 	}
 
-	// If we're resizing from the center (mod + right click), we need to double
-	// the amount we're growing because we're doing it in both directions.
-	if (edge == RESIZE_EDGE_NONE) {
-		grow_width *= 2;
-		grow_height *= 2;
-	}
-
 	// Determine new width/height, and accommodate for min/max values
 	double width = seat->op_ref_width + grow_width;
 	double height = seat->op_ref_height + grow_height;
@@ -508,7 +497,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 	}
 
 	// Check for beginning resize
-	bool resizing_via_border = button == BTN_LEFT && edge;
+	bool resizing_via_border = button == BTN_LEFT && edge != RESIZE_EDGE_NONE;
 	bool resizing_via_mod = button == BTN_RIGHT && mod_pressed;
 	if ((resizing_via_border || resizing_via_mod) &&
 			state == WLR_BUTTON_PRESSED) {
@@ -516,7 +505,8 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 		seat->op_container = cont;
 		seat->op_resize_preserve_ratio = keyboard &&
 			(keyboard->modifiers.depressed & WLR_MODIFIER_SHIFT);
-		seat->op_resize_edge = edge;
+		seat->op_resize_edge = resizing_via_mod ?
+			RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
 		seat->op_button = button;
 		seat->op_ref_lx = cursor->cursor->x;
 		seat->op_ref_ly = cursor->cursor->y;
-- 
cgit v1.2.3


From c299b6b5cd72ce186baa9a0a1cc09a4293431d74 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 13:42:43 +1000
Subject: Use max multiplier when resizing while preserving ratio

---
 sway/input/cursor.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index e5631f5b..a24a7de8 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -238,9 +238,9 @@ static void handle_resize_motion(struct sway_seat *seat,
 	if (seat->op_resize_preserve_ratio) {
 		double x_multiplier = grow_width / seat->op_ref_width;
 		double y_multiplier = grow_height / seat->op_ref_height;
-		double avg_multiplier = (x_multiplier + y_multiplier) / 2;
-		grow_width = seat->op_ref_width * avg_multiplier;
-		grow_height = seat->op_ref_height * avg_multiplier;
+		double max_multiplier = fmax(x_multiplier, y_multiplier);
+		grow_width = seat->op_ref_width * max_multiplier;
+		grow_height = seat->op_ref_height * max_multiplier;
 	}
 
 	// Determine new width/height, and accommodate for min/max values
-- 
cgit v1.2.3


From 350e9ea9293a4c185734ecda9d77ee2fd13502d2 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 15:20:43 +1000
Subject: Fix clicking xwayland menus

---
 sway/input/cursor.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index a24a7de8..7a06cf9c 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -569,6 +569,9 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		seat_set_focus(cursor->seat, cont);
 		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
 				time_msec, button, state);
+	} else {
+		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
+				time_msec, button, state);
 	}
 
 	transaction_commit_dirty();
-- 
cgit v1.2.3


From dd337127d80ce93ba556691c4a4565a19babba0e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 21:29:21 +1000
Subject: Use separate function for choosing edge cursor

---
 sway/input/cursor.c | 59 +++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7a06cf9c..dfb5603e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -299,6 +299,31 @@ static void handle_resize_motion(struct sway_seat *seat,
 	transaction_commit_dirty();
 }
 
+static const char *edge_to_image_name(enum resize_edge edge) {
+	switch (edge) {
+	case RESIZE_EDGE_NONE:
+		return "left_ptr";
+	case RESIZE_EDGE_TOP:
+		return "top_side";
+	case RESIZE_EDGE_RIGHT:
+		return "right_side";
+	case RESIZE_EDGE_BOTTOM:
+		return "bottom_side";
+	case RESIZE_EDGE_LEFT:
+		return "left_side";
+	}
+	if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_LEFT)) {
+		return "top_left_corner";
+	} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_RIGHT)) {
+		return "top_right_corner";
+	} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_LEFT)) {
+		return "bottom_left_corner";
+	} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT)) {
+		return "bottom_right_corner";
+	}
+	return "left_ptr";
+}
+
 void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		bool allow_refocusing) {
 	if (time_msec == 0) {
@@ -378,37 +403,9 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 	} else if (c && container_is_floating(c)) {
 		// Try a floating container's resize edge
 		enum resize_edge edge = find_resize_edge(c, cursor);
-		if (edge == RESIZE_EDGE_NONE) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"left_ptr", cursor->cursor);
-		} else if (edge == RESIZE_EDGE_TOP) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"top_side", cursor->cursor);
-		} else if (edge == RESIZE_EDGE_RIGHT) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"right_side", cursor->cursor);
-		} else if (edge == RESIZE_EDGE_BOTTOM) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"bottom_side", cursor->cursor);
-		} else if (edge == RESIZE_EDGE_LEFT) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"left_side", cursor->cursor);
-		} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_LEFT)) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"top_left_corner", cursor->cursor);
-		} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_RIGHT)) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"top_right_corner", cursor->cursor);
-		} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_LEFT)) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"bottom_left_corner", cursor->cursor);
-		} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT)) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"bottom_right_corner", cursor->cursor);
-		} else {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"left_ptr", cursor->cursor);
-		}
+		const char *image = edge_to_image_name(edge);
+		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
+				cursor->cursor);
 		cursor->image_client = NULL;
 	} else {
 		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-- 
cgit v1.2.3


From 1b3b75a09499972f6fdfb43185f0c9f84c16791e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 21:31:10 +1000
Subject: Use wlr_keyboard_get_modifiers

---
 sway/input/cursor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index dfb5603e..8723e2b4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -480,7 +480,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 
 	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
 	bool mod_pressed = keyboard &&
-		(keyboard->modifiers.depressed & config->floating_mod);
+		(wlr_keyboard_get_modifiers(keyboard) & config->floating_mod);
 	enum resize_edge edge = find_resize_edge(cont, cursor);
 	bool over_title = edge == RESIZE_EDGE_NONE && !surface;
 
@@ -501,7 +501,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 		seat->operation = OP_RESIZE;
 		seat->op_container = cont;
 		seat->op_resize_preserve_ratio = keyboard &&
-			(keyboard->modifiers.depressed & WLR_MODIFIER_SHIFT);
+			(wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT);
 		seat->op_resize_edge = resizing_via_mod ?
 			RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
 		seat->op_button = button;
-- 
cgit v1.2.3


From ff445cc85597ee6bfae01f03d3c246e2326f3981 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Jul 2018 09:28:22 +1000
Subject: Implement xdg shell request_move and request_resize events

Also does a few other related things:

* Now uses enum wlr_edges instead of our own enum resize_edge
* Now uses wlr_xcursor_get_resize_name and removes our own
find_resize_edge_name
* Renames drag to move for consistency
---
 sway/input/cursor.c | 100 ++++++++++++++++------------------------------------
 sway/input/seat.c   |  38 ++++++++++++++++++++
 2 files changed, 69 insertions(+), 69 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 8723e2b4..8b9208c6 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -143,33 +143,33 @@ static struct sway_container *container_at_coords(
 	return output->swayc;
 }
 
-static enum resize_edge find_resize_edge(struct sway_container *cont,
+static enum wlr_edges find_resize_edge(struct sway_container *cont,
 		struct sway_cursor *cursor) {
 	if (cont->type != C_VIEW) {
-		return RESIZE_EDGE_NONE;
+		return WLR_EDGE_NONE;
 	}
 	struct sway_view *view = cont->sway_view;
 	if (view->border == B_NONE || !view->border_thickness || view->using_csd) {
-		return RESIZE_EDGE_NONE;
+		return WLR_EDGE_NONE;
 	}
 
-	enum resize_edge edge = 0;
+	enum wlr_edges edge = 0;
 	if (cursor->cursor->x < cont->x + view->border_thickness) {
-		edge |= RESIZE_EDGE_LEFT;
+		edge |= WLR_EDGE_LEFT;
 	}
 	if (cursor->cursor->y < cont->y + view->border_thickness) {
-		edge |= RESIZE_EDGE_TOP;
+		edge |= WLR_EDGE_TOP;
 	}
 	if (cursor->cursor->x >= cont->x + cont->width - view->border_thickness) {
-		edge |= RESIZE_EDGE_RIGHT;
+		edge |= WLR_EDGE_RIGHT;
 	}
 	if (cursor->cursor->y >= cont->y + cont->height - view->border_thickness) {
-		edge |= RESIZE_EDGE_BOTTOM;
+		edge |= WLR_EDGE_BOTTOM;
 	}
 	return edge;
 }
 
-static void handle_drag_motion(struct sway_seat *seat,
+static void handle_move_motion(struct sway_seat *seat,
 		struct sway_cursor *cursor) {
 	struct sway_container *con = seat->op_container;
 	desktop_damage_whole_container(con);
@@ -218,22 +218,22 @@ static void calculate_floating_constraints(struct sway_container *con,
 static void handle_resize_motion(struct sway_seat *seat,
 		struct sway_cursor *cursor) {
 	struct sway_container *con = seat->op_container;
-	enum resize_edge edge = seat->op_resize_edge;
+	enum wlr_edges edge = seat->op_resize_edge;
 
 	// The amount the mouse has moved since the start of the resize operation
 	// Positive is down/right
 	double mouse_move_x = cursor->cursor->x - seat->op_ref_lx;
 	double mouse_move_y = cursor->cursor->y - seat->op_ref_ly;
 
-	if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) {
+	if (edge == WLR_EDGE_TOP || edge == WLR_EDGE_BOTTOM) {
 		mouse_move_x = 0;
 	}
-	if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) {
+	if (edge == WLR_EDGE_LEFT || edge == WLR_EDGE_RIGHT) {
 		mouse_move_y = 0;
 	}
 
-	double grow_width = edge & RESIZE_EDGE_LEFT ? -mouse_move_x : mouse_move_x;
-	double grow_height = edge & RESIZE_EDGE_TOP ? -mouse_move_y : mouse_move_y;
+	double grow_width = edge & WLR_EDGE_LEFT ? -mouse_move_x : mouse_move_x;
+	double grow_height = edge & WLR_EDGE_TOP ? -mouse_move_y : mouse_move_y;
 
 	if (seat->op_resize_preserve_ratio) {
 		double x_multiplier = grow_width / seat->op_ref_width;
@@ -259,16 +259,16 @@ static void handle_resize_motion(struct sway_seat *seat,
 	// Determine grow x/y values - these are relative to the container's x/y at
 	// the start of the resize operation.
 	double grow_x = 0, grow_y = 0;
-	if (edge & RESIZE_EDGE_LEFT) {
+	if (edge & WLR_EDGE_LEFT) {
 		grow_x = -grow_width;
-	} else if (edge & RESIZE_EDGE_RIGHT) {
+	} else if (edge & WLR_EDGE_RIGHT) {
 		grow_x = 0;
 	} else {
 		grow_x = -grow_width / 2;
 	}
-	if (edge & RESIZE_EDGE_TOP) {
+	if (edge & WLR_EDGE_TOP) {
 		grow_y = -grow_height;
-	} else if (edge & RESIZE_EDGE_BOTTOM) {
+	} else if (edge & WLR_EDGE_BOTTOM) {
 		grow_y = 0;
 	} else {
 		grow_y = -grow_height / 2;
@@ -299,31 +299,6 @@ static void handle_resize_motion(struct sway_seat *seat,
 	transaction_commit_dirty();
 }
 
-static const char *edge_to_image_name(enum resize_edge edge) {
-	switch (edge) {
-	case RESIZE_EDGE_NONE:
-		return "left_ptr";
-	case RESIZE_EDGE_TOP:
-		return "top_side";
-	case RESIZE_EDGE_RIGHT:
-		return "right_side";
-	case RESIZE_EDGE_BOTTOM:
-		return "bottom_side";
-	case RESIZE_EDGE_LEFT:
-		return "left_side";
-	}
-	if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_LEFT)) {
-		return "top_left_corner";
-	} else if (edge == (RESIZE_EDGE_TOP | RESIZE_EDGE_RIGHT)) {
-		return "top_right_corner";
-	} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_LEFT)) {
-		return "bottom_left_corner";
-	} else if (edge == (RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT)) {
-		return "bottom_right_corner";
-	}
-	return "left_ptr";
-}
-
 void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		bool allow_refocusing) {
 	if (time_msec == 0) {
@@ -333,8 +308,8 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 	struct sway_seat *seat = cursor->seat;
 
 	if (seat->operation != OP_NONE) {
-		if (seat->operation == OP_DRAG) {
-			handle_drag_motion(seat, cursor);
+		if (seat->operation == OP_MOVE) {
+			handle_move_motion(seat, cursor);
 		} else {
 			handle_resize_motion(seat, cursor);
 		}
@@ -402,8 +377,9 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		}
 	} else if (c && container_is_floating(c)) {
 		// Try a floating container's resize edge
-		enum resize_edge edge = find_resize_edge(c, cursor);
-		const char *image = edge_to_image_name(edge);
+		enum wlr_edges edge = find_resize_edge(c, cursor);
+		const char *image = edge == WLR_EDGE_NONE ?
+			"left_ptr" : wlr_xcursor_get_resize_name(edge);
 		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
 				cursor->cursor);
 		cursor->image_client = NULL;
@@ -452,7 +428,7 @@ static void handle_cursor_motion_absolute(
 }
 
 static void handle_end_operation(struct sway_seat *seat) {
-	if (seat->operation == OP_DRAG) {
+	if (seat->operation == OP_MOVE) {
 		// We "move" the container to its own location so it discovers its
 		// output again.
 		struct sway_container *con = seat->op_container;
@@ -472,7 +448,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 		struct sway_container *cont) {
 	struct sway_seat *seat = cursor->seat;
 
-	// Deny dragging or resizing a fullscreen view
+	// Deny moving or resizing a fullscreen view
 	if (cont->type == C_VIEW && cont->sway_view->is_fullscreen) {
 		wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
 		return;
@@ -481,36 +457,22 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
 	bool mod_pressed = keyboard &&
 		(wlr_keyboard_get_modifiers(keyboard) & config->floating_mod);
-	enum resize_edge edge = find_resize_edge(cont, cursor);
-	bool over_title = edge == RESIZE_EDGE_NONE && !surface;
+	enum wlr_edges edge = find_resize_edge(cont, cursor);
+	bool over_title = edge == WLR_EDGE_NONE && !surface;
 
-	// Check for beginning drag
+	// Check for beginning move
 	if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED &&
 			(mod_pressed || over_title)) {
-		seat->operation = OP_DRAG;
-		seat->op_container = cont;
-		seat->op_button = button;
+		seat_begin_move(seat, cont);
 		return;
 	}
 
 	// Check for beginning resize
-	bool resizing_via_border = button == BTN_LEFT && edge != RESIZE_EDGE_NONE;
+	bool resizing_via_border = button == BTN_LEFT && edge != WLR_EDGE_NONE;
 	bool resizing_via_mod = button == BTN_RIGHT && mod_pressed;
 	if ((resizing_via_border || resizing_via_mod) &&
 			state == WLR_BUTTON_PRESSED) {
-		seat->operation = OP_RESIZE;
-		seat->op_container = cont;
-		seat->op_resize_preserve_ratio = keyboard &&
-			(wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT);
-		seat->op_resize_edge = resizing_via_mod ?
-			RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
-		seat->op_button = button;
-		seat->op_ref_lx = cursor->cursor->x;
-		seat->op_ref_ly = cursor->cursor->y;
-		seat->op_ref_con_lx = cont->x;
-		seat->op_ref_con_ly = cont->y;
-		seat->op_ref_width = cont->width;
-		seat->op_ref_height = cont->height;
+		seat_begin_resize(seat, cont, button, edge);
 		return;
 	}
 
diff --git a/sway/input/seat.c b/sway/input/seat.c
index e77d88a8..cc5b2e0f 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,6 +1,11 @@
 #define _XOPEN_SOURCE 700
 #define _POSIX_C_SOURCE 199309L
 #include <assert.h>
+#ifdef __linux__
+#include <linux/input-event-codes.h>
+#elif __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#endif
 #include <strings.h>
 #include <time.h>
 #include <wlr/types/wlr_cursor.h>
@@ -348,6 +353,7 @@ struct sway_seat *seat_create(struct sway_input_manager *input,
 		free(seat);
 		return NULL;
 	}
+	seat->wlr_seat->data = seat;
 
 	seat->cursor = sway_cursor_create(seat);
 	if (!seat->cursor) {
@@ -894,3 +900,35 @@ struct seat_config *seat_get_config(struct sway_seat *seat) {
 
 	return NULL;
 }
+
+void seat_begin_move(struct sway_seat *seat, struct sway_container *con) {
+	if (!seat->cursor) {
+		wlr_log(WLR_DEBUG, "Ignoring move request due to no cursor device");
+		return;
+	}
+	seat->operation = OP_MOVE;
+	seat->op_container = con;
+	seat->op_button = BTN_LEFT;
+}
+
+void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
+		uint32_t button, enum wlr_edges edge) {
+	if (!seat->cursor) {
+		wlr_log(WLR_DEBUG, "Ignoring resize request due to no cursor device");
+		return;
+	}
+	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
+	seat->operation = OP_RESIZE;
+	seat->op_container = con;
+	seat->op_resize_preserve_ratio = keyboard &&
+		(wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT);
+	seat->op_resize_edge = edge == WLR_EDGE_NONE ?
+		RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
+	seat->op_button = button;
+	seat->op_ref_lx = seat->cursor->cursor->x;
+	seat->op_ref_ly = seat->cursor->cursor->y;
+	seat->op_ref_con_lx = con->x;
+	seat->op_ref_con_ly = con->y;
+	seat->op_ref_width = con->width;
+	seat->op_ref_height = con->height;
+}
-- 
cgit v1.2.3


From 0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 10:40:12 +1000
Subject: Replace static handle_end_operation with seat_end_mouse_operation

---
 sway/input/cursor.c | 17 +----------------
 sway/input/seat.c   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 8b9208c6..ec83746e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -427,21 +427,6 @@ static void handle_cursor_motion_absolute(
 	transaction_commit_dirty();
 }
 
-static void handle_end_operation(struct sway_seat *seat) {
-	if (seat->operation == OP_MOVE) {
-		// We "move" the container to its own location so it discovers its
-		// output again.
-		struct sway_container *con = seat->op_container;
-		container_floating_move_to(con, con->x, con->y);
-		seat->operation = OP_NONE;
-		seat->op_container = NULL;
-	} else {
-		// OP_RESIZE
-		seat->operation = OP_NONE;
-		seat->op_container = NULL;
-	}
-}
-
 static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 		uint32_t time_msec, uint32_t button, enum wlr_button_state state,
 		struct wlr_surface *surface, double sx, double sy,
@@ -484,7 +469,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		uint32_t time_msec, uint32_t button, enum wlr_button_state state) {
 	if (cursor->seat->operation != OP_NONE &&
 			button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) {
-		handle_end_operation(cursor->seat);
+		seat_end_mouse_operation(cursor->seat);
 		return;
 	}
 	if (time_msec == 0) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
index cc5b2e0f..3a3350e1 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -932,3 +932,22 @@ void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
 	seat->op_ref_width = con->width;
 	seat->op_ref_height = con->height;
 }
+
+void seat_end_mouse_operation(struct sway_seat *seat) {
+	switch (seat->operation) {
+	case OP_MOVE:
+		{
+			// We "move" the container to its own location so it discovers its
+			// output again.
+			struct sway_container *con = seat->op_container;
+			container_floating_move_to(con, con->x, con->y);
+		}
+	case OP_RESIZE:
+		// Don't need to do anything here.
+		break;
+	case OP_NONE:
+		break;
+	}
+	seat->operation = OP_NONE;
+	seat->op_container = NULL;
+}
-- 
cgit v1.2.3


From 6767d8a593723a9b69d018eed13d24a789be9516 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 10:57:14 +1000
Subject: Prevent re-uploading the same cursor image multiple times

---
 sway/input/cursor.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index ec83746e..43721d28 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -371,22 +371,16 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		// Reset cursor if switching between clients
 		struct wl_client *client = wl_resource_get_client(surface->resource);
 		if (client != cursor->image_client) {
-			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-					"left_ptr", cursor->cursor);
-			cursor->image_client = client;
+			cursor_set_image(cursor, "left_ptr", client);
 		}
 	} else if (c && container_is_floating(c)) {
 		// Try a floating container's resize edge
 		enum wlr_edges edge = find_resize_edge(c, cursor);
 		const char *image = edge == WLR_EDGE_NONE ?
 			"left_ptr" : wlr_xcursor_get_resize_name(edge);
-		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
-				cursor->cursor);
-		cursor->image_client = NULL;
+		cursor_set_image(cursor, image, NULL);
 	} else {
-		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
-				"left_ptr", cursor->cursor);
-		cursor->image_client = NULL;
+		cursor_set_image(cursor, "left_ptr", NULL);
 	}
 
 	// send pointer enter/leave
@@ -725,6 +719,16 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 	cursor->image_client = focused_client;
 }
 
+void cursor_set_image(struct sway_cursor *cursor, const char *image,
+		struct wl_client *client) {
+	if (!cursor->image || strcmp(cursor->image, image) != 0) {
+		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
+				cursor->cursor);
+		cursor->image = image;
+	}
+	cursor->image_client = client;
+}
+
 void sway_cursor_destroy(struct sway_cursor *cursor) {
 	if (!cursor) {
 		return;
-- 
cgit v1.2.3


From 9df660ee3188386c907d8feb999636ce8d61d095 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 11:23:48 +1000
Subject: Store last button and use it when views request to move or resize

---
 sway/input/cursor.c | 18 +++++++-----------
 sway/input/seat.c   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 43721d28..ad0ceb94 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -429,7 +429,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 
 	// Deny moving or resizing a fullscreen view
 	if (cont->type == C_VIEW && cont->sway_view->is_fullscreen) {
-		wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
+		seat_pointer_notify_button(seat, time_msec, button, state);
 		return;
 	}
 
@@ -442,7 +442,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 	// Check for beginning move
 	if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED &&
 			(mod_pressed || over_title)) {
-		seat_begin_move(seat, cont);
+		seat_begin_move(seat, cont, BTN_LEFT);
 		return;
 	}
 
@@ -456,7 +456,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 	}
 
 	// Send event to surface
-	wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
+	seat_pointer_notify_button(seat, time_msec, button, state);
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -480,8 +480,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		if (layer->current.keyboard_interactive) {
 			seat_set_focus_layer(cursor->seat, layer);
 		}
-		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
-				time_msec, button, state);
+		seat_pointer_notify_button(cursor->seat, time_msec, button, state);
 	} else if (cont && container_is_floating(cont)) {
 		dispatch_cursor_button_floating(cursor, time_msec, button, state,
 				surface, sx, sy, cont);
@@ -501,15 +500,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 		if (new_ws != old_ws) {
 			seat_set_focus(cursor->seat, cont);
 		}
-		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
-				time_msec, button, state);
+		seat_pointer_notify_button(cursor->seat, time_msec, button, state);
 	} else if (cont) {
 		seat_set_focus(cursor->seat, cont);
-		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
-				time_msec, button, state);
+		seat_pointer_notify_button(cursor->seat, time_msec, button, state);
 	} else {
-		wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
-				time_msec, button, state);
+		seat_pointer_notify_button(cursor->seat, time_msec, button, state);
 	}
 
 	transaction_commit_dirty();
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 3a3350e1..4e803efd 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -901,14 +901,15 @@ struct seat_config *seat_get_config(struct sway_seat *seat) {
 	return NULL;
 }
 
-void seat_begin_move(struct sway_seat *seat, struct sway_container *con) {
+void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
+		uint32_t button) {
 	if (!seat->cursor) {
 		wlr_log(WLR_DEBUG, "Ignoring move request due to no cursor device");
 		return;
 	}
 	seat->operation = OP_MOVE;
 	seat->op_container = con;
-	seat->op_button = BTN_LEFT;
+	seat->op_button = button;
 }
 
 void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
@@ -951,3 +952,10 @@ void seat_end_mouse_operation(struct sway_seat *seat) {
 	seat->operation = OP_NONE;
 	seat->op_container = NULL;
 }
+
+void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
+		uint32_t button, enum wlr_button_state state) {
+	seat->last_button = button;
+	seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
+			time_msec, button, state);
+}
-- 
cgit v1.2.3


From 011d1ebfa4219eb666487529a5a5e7189c14fd40 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 12:13:00 +1000
Subject: Consider view's min/max sizes when resizing

---
 sway/input/cursor.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index ad0ceb94..7deb2b19 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -243,7 +243,7 @@ static void handle_resize_motion(struct sway_seat *seat,
 		grow_height = seat->op_ref_height * max_multiplier;
 	}
 
-	// Determine new width/height, and accommodate for min/max values
+	// Determine new width/height, and accommodate for floating min/max values
 	double width = seat->op_ref_width + grow_width;
 	double height = seat->op_ref_height + grow_height;
 	int min_width, max_width, min_height, max_height;
@@ -252,6 +252,15 @@ static void handle_resize_motion(struct sway_seat *seat,
 	width = fmax(min_width, fmin(width, max_width));
 	height = fmax(min_height, fmin(height, max_height));
 
+	// Apply the view's min/max size
+	if (con->type == C_VIEW) {
+		double view_min_width, view_max_width, view_min_height, view_max_height;
+		view_get_constraints(con->sway_view, &view_min_width, &view_max_width,
+				&view_min_height, &view_max_height);
+		width = fmax(view_min_width, fmin(width, view_max_width));
+		height = fmax(view_min_height, fmin(height, view_max_height));
+	}
+
 	// Recalculate these, in case we hit a min/max limit
 	grow_width = width - seat->op_ref_width;
 	grow_height = height - seat->op_ref_height;
-- 
cgit v1.2.3


From 3faceadffe9c9b334d22cad3a348b82078b542b5 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 21:50:35 +1000
Subject: Fix focus bug with floating containers

---
 sway/input/cursor.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7deb2b19..54cd3bf7 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -465,6 +465,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
 	}
 
 	// Send event to surface
+	seat_set_focus(seat, cont);
 	seat_pointer_notify_button(seat, time_msec, button, state);
 }
 
-- 
cgit v1.2.3


From 5ba2ae9c6a4372cbf6f8867b711bb55ef6937cb4 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 22:14:36 +1000
Subject: Implement request_move and request_resize for xwayland views

I discovered we have to send a click event when ending the move or
resize operation to make xwayland's requests work correctly.
---
 sway/input/cursor.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 54cd3bf7..f9b59fcc 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -474,6 +474,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 	if (cursor->seat->operation != OP_NONE &&
 			button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) {
 		seat_end_mouse_operation(cursor->seat);
+		seat_pointer_notify_button(cursor->seat, time_msec, button, state);
 		return;
 	}
 	if (time_msec == 0) {
-- 
cgit v1.2.3


From 009b42602460076f96073166ce647aa59177b961 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 22:44:09 +1000
Subject: Fix damage when shrinking a floating view using cursor

---
 sway/input/cursor.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index f9b59fcc..ee50dcde 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -305,7 +305,6 @@ static void handle_resize_motion(struct sway_seat *seat,
 	}
 
 	arrange_windows(con);
-	transaction_commit_dirty();
 }
 
 void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
-- 
cgit v1.2.3


From d21d4b83a3effc56b177f5d505aedfdf2ddbbbd5 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 23:10:06 +1000
Subject: Set cursor when beginning resize and move operations

---
 sway/input/cursor.c | 4 ++++
 sway/input/seat.c   | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index ee50dcde..771ad01d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -215,6 +215,7 @@ static void calculate_floating_constraints(struct sway_container *con,
 		*max_height = config->floating_maximum_height;
 	}
 }
+
 static void handle_resize_motion(struct sway_seat *seat,
 		struct sway_cursor *cursor) {
 	struct sway_container *con = seat->op_container;
@@ -704,6 +705,9 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 		void *data) {
 	struct sway_cursor *cursor =
 		wl_container_of(listener, cursor, request_set_cursor);
+	if (cursor->seat->operation != OP_NONE) {
+		return;
+	}
 	struct wlr_seat_pointer_request_set_cursor_event *event = data;
 
 	struct wl_client *focused_client = NULL;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 4e803efd..273223db 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -910,6 +910,7 @@ void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
 	seat->operation = OP_MOVE;
 	seat->op_container = con;
 	seat->op_button = button;
+	cursor_set_image(seat->cursor, "grab", NULL);
 }
 
 void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
@@ -932,6 +933,10 @@ void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
 	seat->op_ref_con_ly = con->y;
 	seat->op_ref_width = con->width;
 	seat->op_ref_height = con->height;
+
+	const char *image = edge == WLR_EDGE_NONE ?
+		"se-resize" : wlr_xcursor_get_resize_name(edge);
+	cursor_set_image(seat->cursor, image, NULL);
 }
 
 void seat_end_mouse_operation(struct sway_seat *seat) {
@@ -951,6 +956,7 @@ void seat_end_mouse_operation(struct sway_seat *seat) {
 	}
 	seat->operation = OP_NONE;
 	seat->op_container = NULL;
+	cursor_set_image(seat->cursor, "left_ptr", NULL);
 }
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
-- 
cgit v1.2.3


From 44e218574f96d46f36f6bd6e0b7625ae3c97593f Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Mon, 23 Jul 2018 15:40:05 -0400
Subject: Add missing checks to fix 2339

---
 sway/input/seat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sway/input')

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 273223db..fc9e54b6 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -628,6 +628,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 
 	if (last_workspace && last_workspace == new_workspace
 			&& last_workspace->sway_workspace->fullscreen
+			&& container && container->type == C_VIEW
 			&& !container->sway_view->is_fullscreen) {
 		return;
 	}
-- 
cgit v1.2.3


From 0db6f2ef58fe81375219f9cc2e650661f6bd02ce Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 24 Jul 2018 09:09:49 +1000
Subject: Fix some cases where the cursor doesn't update

cursor_set_image only uploads the named image if it doesn't match the
previous named image. This means when setting the cursor image to a
surface as given by a client, we have to clear the currently stored
image.
---
 sway/input/cursor.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sway/input')

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 771ad01d..65d04cac 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -726,6 +726,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 
 	wlr_cursor_set_surface(cursor->cursor, event->surface, event->hotspot_x,
 		event->hotspot_y);
+	cursor->image = NULL;
 	cursor->image_client = focused_client;
 }
 
-- 
cgit v1.2.3