circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-20 17:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-15 13:30:08 +01:00
parent 45bb3e7ffc 057b688fc7
commit 13de7cafb2
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
screen-redraw.c
View File

@@ -1154,7 +1154,7 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
struct visible_range *ri; struct visible_range *ri;
static struct visible_ranges sr = { NULL, 0, 0 }; static struct visible_ranges sr = { NULL, 0, 0 };
int found_self, sb, sb_w, sb_pos; int found_self, sb, sb_w, sb_pos;
u_int lb, rb, tb, bb; int lb, rb, tb, bb, sx, ex;
u_int i, s; u_int i, s;
if (py < 0 || width == 0) if (py < 0 || width == 0)
@@ -1207,11 +1207,10 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
bb = wp->yoff + wp->sy; bb = wp->yoff + wp->sy;
if (!found_self || if (!found_self ||
!window_pane_visible(wp) || !window_pane_visible(wp) ||
(u_int)py < tb || py < tb ||
(u_int)py > bb) py > bb)
continue; continue;
if (!window_pane_is_floating(wp) && if (!window_pane_is_floating(wp) && (py == tb || py == bb))
((u_int)py == tb || (u_int)py == bb))
continue; continue;
sb_w = wp->scrollbar_style.width + wp->scrollbar_style.pad; sb_w = wp->scrollbar_style.width + wp->scrollbar_style.pad;
@@ -1235,34 +1234,29 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
rb = wp->xoff + wp->sx; rb = wp->xoff + wp->sx;
else /* PANE_SCROLLBARS_RIGHT or none. */ else /* PANE_SCROLLBARS_RIGHT or none. */
rb = wp->xoff + wp->sx + sb_w; rb = wp->xoff + wp->sx + sb_w;
if (rb > w->sx) if (rb > (int)w->sx)
rb = w->sx - 1; rb = w->sx - 1;
if (lb > ri->px && sx = ri->px;
lb < ri->px + ri->nx && ex = sx + ri->nx - 1;
rb >= ri->px + ri->nx) if (lb > sx && lb <= ex && rb > ex) {
{
/* /*
* If the left edge of floating pane falls * If the left edge of floating pane falls
* inside this range and right edge covers up * inside this range and right edge covers up
* to right of range, then shrink left edge of * to right of range, then shrink left edge of
* range. * range.
*/ */
ri->nx = lb - ri->px; ri->nx = lb - sx;
} } else if (rb >= sx && rb <= ex && lb <= sx) {
else if (rb >= ri->px &&
rb < ri->px + ri->nx &&
lb <= ri->px) {
/* /*
* Else if the right edge of floating pane falls * Else if the right edge of floating pane falls
* inside of this range and left edge covers * inside of this range and left edge covers
* the left of range, then move px forward to * the left of range, then move px forward to
* right edge of pane. * right edge of pane.
*/ */
ri->nx = ri->nx - (rb + 1 - ri->px); ri->nx = ex - rb;
ri->px = ri->px + (rb + 1 - ri->px); ri->px = rb + 1;
} } else if (lb > sx && rb <= ex) {
else if (lb > ri->px && rb < ri->px + ri->nx) {
/* /*
* Else if pane fully inside range then split * Else if pane fully inside range then split
* into 2 ranges. * into 2 ranges.
@@ -1274,11 +1268,11 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
} }
ri = &r->ranges[i]; ri = &r->ranges[i];
r->ranges[i + 1].px = rb + 1; r->ranges[i + 1].px = rb + 1;
r->ranges[i + 1].nx = ri->px + ri->nx - (rb + 1); r->ranges[i + 1].nx = ex - rb;
/* ri->px was copied, unchanged. */ /* ri->px was copied, unchanged. */
ri->nx = lb - ri->px; ri->nx = lb - sx;
r->used++; r->used++;
} else if (lb <= ri->px && rb >= ri->px + ri->nx) { } else if (lb <= sx && rb > ex) {
/* /*
* If floating pane completely covers this range * If floating pane completely covers this range
* then delete it (make it 0 length). * then delete it (make it 0 length).