2 files changed, 76 insertions, 14 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index f8302ddf..510030ae 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -384,6 +384,30 @@ static void handle_move_tiling_motion(struct sway_seat *seat,
 	desktop_damage_box(&seat->op_drop_box);
 }
 
+static void handle_move_tiling_threshold_motion(struct sway_seat *seat,
+		struct sway_cursor *cursor) {
+	double cx = seat->cursor->cursor->x;
+	double cy = seat->cursor->cursor->y;
+	double sx = seat->op_ref_lx;
+	double sy = seat->op_ref_ly;
+
+	// Get the scaled threshold for the output. Even if the operation goes
+	// across multiple outputs of varying scales, just use the scale for the
+	// output that the cursor is currently on for simplicity.
+	struct wlr_output *wlr_output = wlr_output_layout_output_at(
+			root->output_layout, cx, cy);
+	double output_scale = wlr_output ? wlr_output->scale : 1;
+	double threshold = config->tiling_drag_threshold * output_scale;
+	threshold *= threshold;
+
+	// If the threshold has been exceeded, start the actual drag
+	if ((cx - sx) * (cx - sx) + (cy - sy) * (cy - sy) > threshold) {
+		seat->operation = OP_MOVE_TILING;
+		cursor_set_image(cursor, "grab", NULL);
+		handle_move_tiling_motion(seat, cursor);
+	}
+}
+
 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
@@ -597,7 +621,7 @@ static int hide_notify(void *data) {
 	return 1;
 }
 
-void cursor_handle_activity(struct sway_cursor *cursor) {
+int cursor_get_timeout(struct sway_cursor *cursor){
 	struct seat_config *sc = seat_get_config(cursor->seat);
 	if (!sc) {
 		sc = seat_get_config_by_name("*");
@@ -606,20 +630,31 @@ void cursor_handle_activity(struct sway_cursor *cursor) {
 	if (timeout < 0) {
 		timeout = 0;
 	}
-	wl_event_source_timer_update(cursor->hide_source, timeout);
+	return timeout;
+}
+
+void cursor_handle_activity(struct sway_cursor *cursor) {
+	wl_event_source_timer_update(
+			cursor->hide_source, cursor_get_timeout(cursor));
 
 	wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat);
 	if (cursor->hidden) {
-		cursor->hidden = false;
-		if (cursor->image_surface) {
-			cursor_set_image_surface(cursor, cursor->image_surface,
-					cursor->hotspot_x, cursor->hotspot_y,
-					cursor->image_client);
-		} else {
-			const char *image = cursor->image;
-			cursor->image = NULL;
-			cursor_set_image(cursor, image, cursor->image_client);
-		}
+		cursor_unhide(cursor);
+	}
+}
+
+void cursor_unhide(struct sway_cursor *cursor) {
+	cursor->hidden = false;
+	if (cursor->image_surface) {
+		cursor_set_image_surface(cursor,
+				cursor->image_surface,
+				cursor->hotspot_x,
+				cursor->hotspot_y,
+				cursor->image_client);
+	} else {
+		const char *image = cursor->image;
+		cursor->image = NULL;
+		cursor_set_image(cursor, image, cursor->image_client);
 	}
 }
 
@@ -640,6 +675,9 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor,
 		case OP_MOVE_FLOATING:
 			handle_move_floating_motion(seat, cursor);
 			break;
+		case OP_MOVE_TILING_THRESHOLD:
+			handle_move_tiling_threshold_motion(seat, cursor);
+			break;
 		case OP_MOVE_TILING:
 			handle_move_tiling_motion(seat, cursor);
 			break;
@@ -984,12 +1022,21 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 	if (config->tiling_drag && (mod_pressed || on_titlebar) &&
 			state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
 			cont && !cont->is_fullscreen) {
-		if (on_titlebar) {
+		struct sway_container *focus = seat_get_focused_container(seat);
+		bool focused = focus == cont || container_has_ancestor(focus, cont);
+		if (on_titlebar && !focused) {
 			node = seat_get_focus_inactive(seat, &cont->node);
 			seat_set_focus(seat, node);
 		}
+
 		seat_pointer_notify_button(seat, time_msec, button, state);
-		seat_begin_move_tiling(seat, cont, button);
+
+		// If moving a container by it's title bar, use a threshold for the drag
+		if (!mod_pressed && config->tiling_drag_threshold > 0) {
+			seat_begin_move_tiling_threshold(seat, cont, button);
+		} else {
+			seat_begin_move_tiling(seat, cont, button);
+		}
 		return;
 	}
 
diff --git a/sway/input/seat.c b/sway/input/seat.c
index fa82c9ce..52790039 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1052,6 +1052,17 @@ void seat_begin_move_floating(struct sway_seat *seat,
 	cursor_set_image(seat->cursor, "grab", NULL);
 }
 
+void seat_begin_move_tiling_threshold(struct sway_seat *seat,
+		struct sway_container *con, uint32_t button) {
+	seat->operation = OP_MOVE_TILING_THRESHOLD;
+	seat->op_container = con;
+	seat->op_button = button;
+	seat->op_target_node = NULL;
+	seat->op_target_edge = 0;
+	seat->op_ref_lx = seat->cursor->cursor->x;
+	seat->op_ref_ly = seat->cursor->cursor->y;
+}
+
 void seat_begin_move_tiling(struct sway_seat *seat,
 		struct sway_container *con, uint32_t button) {
 	seat->operation = OP_MOVE_TILING;
@@ -1220,4 +1231,8 @@ void seat_consider_warp_to_focus(struct sway_seat *seat) {
 	} else {
 		cursor_warp_to_workspace(seat->cursor, focus->sway_workspace);
 	}
+	if (seat->cursor->hidden){
+		cursor_unhide(seat->cursor);
+		wl_event_source_timer_update(seat->cursor->hide_source, cursor_get_timeout(seat->cursor));
+	}
 }