From c54a5b3690e985797a1fcdd3c5e49b758efd4825 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 11 May 2017 07:24:42 +0000
Subject: Change how we resolve which pane is dragging when there are multiple
 options - choose the largest pane, which is more likely to be the one the
 user wants to resize. Prompted by a report from Thomas Sattler.

---
 cmd-resize-pane.c | 56 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

(limited to 'cmd-resize-pane.c')

diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c
index 2ad11c23..bbb78de7 100644
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -129,9 +129,8 @@ static void
 cmd_resize_pane_mouse_update(struct client *c, struct mouse_event *m)
 {
 	struct winlink		*wl;
-	struct window_pane	*wp;
-	int			 found;
-	u_int			 y, ly;
+	struct window_pane	*loop, *wp_x, *wp_y;
+	u_int			 y, ly, x, lx, sx, sy, ex, ey;
 
 	wl = cmd_mouse_window(m, NULL);
 	if (wl == NULL) {
@@ -139,37 +138,48 @@ cmd_resize_pane_mouse_update(struct client *c, struct mouse_event *m)
 		return;
 	}
 
-	y = m->y;
+	y = m->y; x = m->x;
 	if (m->statusat == 0 && y > 0)
 		y--;
 	else if (m->statusat > 0 && y >= (u_int)m->statusat)
 		y = m->statusat - 1;
-	ly = m->ly;
+	ly = m->ly; lx = m->lx;
 	if (m->statusat == 0 && ly > 0)
 		ly--;
 	else if (m->statusat > 0 && ly >= (u_int)m->statusat)
 		ly = m->statusat - 1;
 
-	found = 0;
-	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
-		if (!window_pane_visible(wp))
+	wp_x = wp_y = NULL;
+	TAILQ_FOREACH(loop, &wl->window->panes, entry) {
+		if (!window_pane_visible(loop))
 			continue;
 
-		if (wp->xoff + wp->sx == m->lx &&
-		    wp->yoff <= 1 + ly &&
-		    wp->yoff + wp->sy >= ly) {
-			layout_resize_pane(wp, LAYOUT_LEFTRIGHT, m->x - m->lx, 0);
-			found = 1;
-		}
-		if (wp->yoff + wp->sy == ly &&
-		    wp->xoff <= 1 + m->lx &&
-		    wp->xoff + wp->sx >= m->lx) {
-			layout_resize_pane(wp, LAYOUT_TOPBOTTOM, y - ly, 0);
-			found = 1;
-		}
+		sx = loop->xoff;
+		if (sx != 0)
+			sx--;
+		ex = loop->xoff + loop->sx;
+
+		sy = loop->yoff;
+		if (sy != 0)
+			sy--;
+		ey = loop->yoff + loop->sy;
+
+		if ((lx == sx || lx == ex) &&
+		    (ly >= sy && ly <= ey) &&
+		    (wp_x == NULL || loop->sy > wp_x->sy))
+			wp_x = loop;
+		if ((ly == sy || ly == ey) &&
+		    (lx >= sx && lx <= ex) &&
+		    (wp_y == NULL || loop->sx > wp_y->sx))
+			wp_y = loop;
 	}
-	if (found)
-		server_redraw_window(wl->window);
-	else
+	if (wp_x == NULL && wp_y == NULL) {
 		c->tty.mouse_drag_update = NULL;
+		return;
+	}
+	if (wp_x != NULL)
+		layout_resize_pane(wp_x, LAYOUT_LEFTRIGHT, x - lx, 0);
+	if (wp_y != NULL)
+		layout_resize_pane(wp_y, LAYOUT_TOPBOTTOM, y - ly, 0);
+	server_redraw_window(wl->window);
 }
-- 
cgit v1.2.3