From 56102da12416a97947de2d90518442090a0c9fb4 Mon Sep 17 00:00:00 2001
From: Dudemanguy911 <random342@airmail.cc>
Date: Thu, 10 May 2018 14:29:45 -0500
Subject: [PATCH] refactor container_at to return the correct container in
 tabbed layout

---
 sway/input/cursor.c   |  5 +---
 sway/tree/container.c | 53 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 116899eab..c0c6e827f 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -222,10 +222,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 			seat_set_focus(cursor->seat, cont);
 		}
 	} else {
-		//TODO: set focus on top border click for tabbed view
-		if (cont && cont->parent->layout != L_TABBED) {
-			seat_set_focus(cursor->seat, cont);
-		}
+		seat_set_focus(cursor->seat, cont);
 	}
 
 	wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 38db29c2f..ac9e690fc 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -421,6 +421,8 @@ struct sway_container *container_at(struct sway_container *parent,
 
 	list_add(queue, parent);
 
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus = seat_get_focus_inactive(seat, parent);
 	struct sway_container *swayc = NULL;
 	while (queue->length) {
 		swayc = queue->items[0];
@@ -460,21 +462,54 @@ struct sway_container *container_at(struct sway_container *parent,
 					view_sx, view_sy, &_sx, &_sy);
 				break;
 			}
-			if (_surface) {
-				*sx = _sx;
-				*sy = _sy;
-				*surface = _surface;
-				return swayc;
-			}
 			// Check the view's decorations
 			struct wlr_box swayc_box = {
 				.x = swayc->x,
 				.y = swayc->y,
 				.width = swayc->width,
-				.height = swayc->height,
+				.height = swayc->height
 			};
-			if (wlr_box_contains_point(&swayc_box, ox, oy)) {
-				return swayc;
+			// Check which tab the mouse is on
+			int depth;
+			int num_tabs = swayc->parent->children->length;
+			double tab_width = swayc->width / num_tabs;
+			struct wlr_box tab_box = {
+				.y = swayc->y,
+				.width = swayc->width / num_tabs,
+				.height = swayc->sway_view->y - swayc->y
+			};
+			switch (swayc->parent->layout) {
+			case L_NONE:
+			case L_HORIZ:
+			case L_VERT:
+				if (_surface) {
+					*sx = _sx;
+					*sy = _sy;
+					*surface = _surface;
+					return swayc;
+				}
+				if (wlr_box_contains_point(&swayc_box, ox, oy)) {
+					return swayc;
+				}
+				break;
+			case L_TABBED:
+				for (depth = 0; depth < num_tabs; ++depth) {
+					tab_box.x = swayc->x + depth * tab_width;
+					*sx = _sx;
+					*sy = _sy;
+					*surface = _surface;
+					if (wlr_box_contains_point(&tab_box, ox, oy)) {
+						return swayc->parent->children->items[depth];
+					}
+				}
+				if (focus == swayc) {
+					return swayc;
+				}
+				break;
+			case L_STACKED:
+				break;
+			case L_FLOATING:
+				break;
 			}
 		} else {
 			list_cat(queue, swayc->children);