circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-07-03 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-07-01 00:00:06 +01:00
parent 8d470017bc 1e9a16a748
commit 41b4743eba
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server-client.c
View File

@@ -2048,19 +2048,18 @@ server_client_reset_state(struct client *c)
if (!window_position_is_visible(r, cx)) if (!window_position_is_visible(r, cx))
cursor = 0; cursor = 0;
if (window_pane_scrollbar_overlay_visible(wp)) { if (window_pane_scrollbar_overlay_visible(wp)) {
sb_w = wp->scrollbar_style.width; sb_w = wp->scrollbar_style.width;
if (sb_w > wp->sx) if (sb_w > wp->sx)
sb_w = wp->sx; sb_w = wp->sx;
if (sb_w != 0 && if (sb_w != 0 &&
w->sb_pos == w->sb_pos == PANE_SCROLLBARS_LEFT) {
PANE_SCROLLBARS_LEFT) { if (s->cx < sb_w)
if (s->cx < sb_w) cursor = 0;
} else if (sb_w != 0 &&
s->cx >= wp->sx - sb_w)
cursor = 0; cursor = 0;
} else if (sb_w != 0 && }
s->cx >= wp->sx - sb_w)
cursor = 0;
}
if (status_at_line(c) == 0) if (status_at_line(c) == 0)
cy += status_line_size(c); cy += status_line_size(c);
@@ -2089,10 +2088,10 @@ server_client_reset_state(struct client *c)
mode |= MODE_MOUSE_ALL; mode |= MODE_MOUSE_ALL;
} }
} }
if (options_get_number(oo, "focus-follows-mouse") || if (options_get_number(oo, "focus-follows-mouse") ||
w->sb == PANE_SCROLLBARS_MODAL || w->sb == PANE_SCROLLBARS_MODAL ||
w->sb == PANE_SCROLLBARS_AUTOHIDE) w->sb == PANE_SCROLLBARS_AUTOHIDE)
mode |= MODE_MOUSE_ALL; mode |= MODE_MOUSE_ALL;
else if (~mode & MODE_MOUSE_ALL) else if (~mode & MODE_MOUSE_ALL)
mode |= MODE_MOUSE_BUTTON; mode |= MODE_MOUSE_BUTTON;
} }