From 74a5069c0a25a5207ceca6b22dc6c9b135bf118a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 30 Jun 2026 22:44:21 +0000
Subject: [PATCH 1/2] Fix some indentation.

---
 server-client.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server-client.c b/server-client.c
index 3dc294c99..e0a9d08b8 100644
--- a/server-client.c
+++ b/server-client.c
@@ -2093,10 +2093,10 @@ server_client_reset_state(struct client *c)
 					mode |= MODE_MOUSE_ALL;
 			}
 		}
-	if (options_get_number(oo, "focus-follows-mouse") ||
-	    w->sb == PANE_SCROLLBARS_MODAL ||
-	    w->sb == PANE_SCROLLBARS_AUTOHIDE)
-		mode |= MODE_MOUSE_ALL;
+		if (options_get_number(oo, "focus-follows-mouse") ||
+		    w->sb == PANE_SCROLLBARS_MODAL ||
+		    w->sb == PANE_SCROLLBARS_AUTOHIDE)
+			mode |= MODE_MOUSE_ALL;
 		else if (~mode & MODE_MOUSE_ALL)
 			mode |= MODE_MOUSE_BUTTON;
 	}

From 1e9a16a748776cec6980f5d575d3235e2caf11f7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 30 Jun 2026 22:48:12 +0000
Subject: [PATCH 2/2] And some other indentation.

---
 server-client.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/server-client.c b/server-client.c
index e0a9d08b8..c25c7ca19 100644
--- a/server-client.c
+++ b/server-client.c
@@ -2052,19 +2052,18 @@ server_client_reset_state(struct client *c)
 				if (!window_position_is_visible(r, cx))
 					cursor = 0;
 
-			if (window_pane_scrollbar_overlay_visible(wp)) {
-				sb_w = wp->scrollbar_style.width;
-				if (sb_w > wp->sx)
-					sb_w = wp->sx;
-				if (sb_w != 0 &&
-	    w->sb_pos ==
-	    PANE_SCROLLBARS_LEFT) {
-					if (s->cx < sb_w)
+				if (window_pane_scrollbar_overlay_visible(wp)) {
+					sb_w = wp->scrollbar_style.width;
+					if (sb_w > wp->sx)
+						sb_w = wp->sx;
+					if (sb_w != 0 &&
+					    w->sb_pos == PANE_SCROLLBARS_LEFT) {
+						if (s->cx < sb_w)
+							cursor = 0;
+					} else if (sb_w != 0 &&
+					    s->cx >= wp->sx - sb_w)
 						cursor = 0;
-				} else if (sb_w != 0 &&
-				    s->cx >= wp->sx - sb_w)
-					cursor = 0;
-			}
+				}
 
 				if (status_at_line(c) == 0)
 					cy += status_line_size(c);