circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into floating_panes

Browse Source
This commit is contained in:
Nicholas Marriott
2026-05-29 09:40:53 +01:00
parent ec901e9e31 99b08ecde5
commit e5c69afa98
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@@ -242,6 +242,7 @@ if ENABLE_SIXEL
dist_tmux_SOURCES += image.c image-sixel.c dist_tmux_SOURCES += image.c image-sixel.c
endif endif
# Add bits for fuzzing if enabled.
if NEED_FUZZING if NEED_FUZZING
check_PROGRAMS = \ check_PROGRAMS = \
fuzz/input-fuzzer \ fuzz/input-fuzzer \
@@ -270,3 +271,7 @@ install-exec-hook:
$(mkdir_p) $(DESTDIR)$(mandir)/man1 $(mkdir_p) $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
$(DESTDIR)$(mandir)/man1/tmux.1 $(DESTDIR)$(mandir)/man1/tmux.1
# And uninstall it.
uninstall-hook:
rm -f $(DESTDIR)$(mandir)/man1/tmux.1

11
screen-write.c
View File

@@ -2447,7 +2447,8 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
struct tty_ctx ttyctx; struct tty_ctx ttyctx;
u_int sx = screen_size_x(s), sy = screen_size_y(s); u_int sx = screen_size_x(s), sy = screen_size_y(s);
u_int width = ud->width, xx, not_wrap, i, n, vis; u_int width = ud->width, xx, not_wrap, i, n, vis;
int selected, skip = 1, redraw = 0, yoff = 0; int selected, skip = 1, redraw = 0;
int yoff = 0, xoff = 0;
struct visible_ranges *r; struct visible_ranges *r;
struct visible_range *ri; struct visible_range *ri;
@@ -2548,10 +2549,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
skip = 0; skip = 0;
/* Get visible ranges for the character before moving the cursor. */ /* Get visible ranges for the character before moving the cursor. */
if (wp != NULL) if (wp != NULL) {
xoff = wp->xoff;
yoff = wp->yoff; yoff = wp->yoff;
r = screen_redraw_get_visible_ranges(wp, s->cx, s->cy + yoff, width, }
NULL); r = screen_redraw_get_visible_ranges(wp, xoff + s->cx, s->cy + yoff,
width, NULL);
/* /*
* Move the cursor. If not wrapping, stick at the last character and * Move the cursor. If not wrapping, stick at the last character and