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

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  tmux: remove redundant event_del()/evtimer_del()
  Like xterm, ignore DL and EL outside the scroll region, GitHub issue 5754.
This commit is contained in:
Nicholas Marriott
2026-10-16 13:38:05 +01:00
parent de0c3e0a78 00bddc8893
commit b7e81de85e
5 changed files with 10 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
input.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: input.c,v 1.277 2026/10/14 16:23:43 nicm Exp $ */ /* $OpenBSD: input.c,v 1.278 2026/10/16 11:34:49 bket Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -826,7 +826,6 @@ input_start_ground_timer(struct input_ctx *ictx)
{ {
struct timeval tv = { .tv_sec = 5, .tv_usec = 0 }; struct timeval tv = { .tv_sec = 5, .tv_usec = 0 };
event_del(&ictx->ground_timer);
event_add(&ictx->ground_timer, &tv); event_add(&ictx->ground_timer, &tv);
} }
@@ -3588,7 +3587,6 @@ input_start_request_timer(struct input_ctx *ictx)
{ {
struct timeval tv = { .tv_sec = 0, .tv_usec = 100000 }; struct timeval tv = { .tv_sec = 0, .tv_usec = 100000 };
event_del(&ictx->request_timer);
event_add(&ictx->request_timer, &tv); event_add(&ictx->request_timer, &tv);
} }

81
screen-write.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-write.c,v 1.302 2026/10/16 07:59:06 nicm Exp $ */ /* $OpenBSD: screen-write.c,v 1.303 2026/10/16 11:33:44 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1633,39 +1633,12 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid *gd = s->grid; struct grid *gd = s->grid;
struct tty_ctx ttyctx; struct tty_ctx ttyctx;
u_int sy = screen_size_y(s);
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
if (s->cy < s->rupper || s->cy > s->rlower) { if (s->cy < s->rupper || s->cy > s->rlower)
if (ny > sy - s->cy)
ny = sy - s->cy;
if (ny == 0)
return;
screen_write_initctx(ctx, &ttyctx, 1, 1);
ttyctx.bg = bg;
#ifdef ENABLE_IMAGES
image_redraw_area(ctx, 0, s->cy, screen_size_x(s), sy - s->cy);
#endif
grid_view_insert_lines(gd, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.n = ny;
if (!screen_write_should_draw_lines(ctx, s->cy, sy - s->cy))
return;
if (~ttyctx.flags & TTY_CTX_PANE_OBSCURED || ctx->wp == NULL) {
tty_write(tty_cmd_insertline, &ttyctx);
return;
}
screen_write_redraw_pane(ctx, &ttyctx);
return; return;
}
if (ny > s->rlower + 1 - s->cy) if (ny > s->rlower + 1 - s->cy)
ny = s->rlower + 1 - s->cy; ny = s->rlower + 1 - s->cy;
@@ -1675,15 +1648,7 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
screen_write_initctx(ctx, &ttyctx, 1, 1); screen_write_initctx(ctx, &ttyctx, 1, 1);
ttyctx.bg = bg; ttyctx.bg = bg;
#ifdef ENABLE_IMAGES grid_view_insert_lines_region(gd, s->rlower, s->cy, ny, bg);
image_redraw_area(ctx, 0, s->cy, screen_size_x(s),
s->rlower + 1 - s->cy);
#endif
if (s->cy < s->rupper || s->cy > s->rlower)
grid_view_insert_lines(gd, s->cy, ny, bg);
else
grid_view_insert_lines_region(gd, s->rlower, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__); screen_write_collect_flush(ctx, 0, __func__);
ttyctx.n = ny; ttyctx.n = ny;
@@ -1705,40 +1670,13 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid *gd = s->grid; struct grid *gd = s->grid;
struct tty_ctx ttyctx; struct tty_ctx ttyctx;
u_int sy = screen_size_y(s), ry; u_int ry;
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
if (s->cy < s->rupper || s->cy > s->rlower) { if (s->cy < s->rupper || s->cy > s->rlower)
if (ny > sy - s->cy)
ny = sy - s->cy;
if (ny == 0)
return;
screen_write_initctx(ctx, &ttyctx, 1, 1);
ttyctx.bg = bg;
#ifdef ENABLE_IMAGES
image_redraw_area(ctx, 0, s->cy, screen_size_x(s), sy - s->cy);
#endif
grid_view_delete_lines(gd, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.n = ny;
ry = s->rlower + 1 - s->rupper;
if (!screen_write_should_draw_lines(ctx, s->rupper, ry))
return;
if (~ttyctx.flags & TTY_CTX_PANE_OBSCURED || ctx->wp == NULL) {
tty_write(tty_cmd_deleteline, &ttyctx);
return;
}
screen_write_redraw_pane(ctx, &ttyctx);
return; return;
}
ry = s->rlower + 1 - s->cy; ry = s->rlower + 1 - s->cy;
if (ny > ry) if (ny > ry)
@@ -1749,14 +1687,7 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
screen_write_initctx(ctx, &ttyctx, 1, 1); screen_write_initctx(ctx, &ttyctx, 1, 1);
ttyctx.bg = bg; ttyctx.bg = bg;
#ifdef ENABLE_IMAGES grid_view_delete_lines_region(gd, s->rlower, s->cy, ny, bg);
image_redraw_area(ctx, 0, s->cy, screen_size_x(s), ry);
#endif
if (s->cy < s->rupper || s->cy > s->rlower)
grid_view_delete_lines(gd, s->cy, ny, bg);
else
grid_view_delete_lines_region(gd, s->rlower, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__); screen_write_collect_flush(ctx, 0, __func__);
ttyctx.n = ny; ttyctx.n = ny;

4
server-client.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: server-client.c,v 1.523 2026/10/16 07:59:06 nicm Exp $ */ /* $OpenBSD: server-client.c,v 1.524 2026/10/16 11:34:49 bket Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1092,7 +1092,6 @@ have_event:
log_debug("click timer started"); log_debug("click timer started");
tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000; tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000;
tv.tv_usec = (KEYC_CLICK_TIMEOUT % 1000) * 1000L; tv.tv_usec = (KEYC_CLICK_TIMEOUT % 1000) * 1000L;
evtimer_del(&c->click_timer);
evtimer_add(&c->click_timer, &tv); evtimer_add(&c->click_timer, &tv);
} }
} }
@@ -1572,7 +1571,6 @@ try_again:
tv.tv_sec = repeat / 1000; tv.tv_sec = repeat / 1000;
tv.tv_usec = (repeat % 1000) * 1000L; tv.tv_usec = (repeat % 1000) * 1000L;
evtimer_del(&c->repeat_timer);
evtimer_add(&c->repeat_timer, &tv); evtimer_add(&c->repeat_timer, &tv);
} else { } else {
c->flags &= ~CLIENT_REPEAT; c->flags &= ~CLIENT_REPEAT;

3
tty.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty.c,v 1.491 2026/10/16 07:59:06 nicm Exp $ */ /* $OpenBSD: tty.c,v 1.492 2026/10/16 11:34:49 bket Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -337,7 +337,6 @@ tty_start_start_timer(struct tty *tty)
struct timeval tv = { .tv_sec = TTY_QUERY_TIMEOUT }; struct timeval tv = { .tv_sec = TTY_QUERY_TIMEOUT };
log_debug("%s: start timer started", c->name); log_debug("%s: start timer started", c->name);
evtimer_del(&tty->start_timer);
evtimer_add(&tty->start_timer, &tv); evtimer_add(&tty->start_timer, &tv);
} }

3
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.386 2026/10/13 10:21:58 nicm Exp $ */ /* $OpenBSD: window.c,v 1.387 2026/10/16 11:34:49 bket Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2719,7 +2719,6 @@ window_pane_scrollbar_start_timer(struct window_pane *wp)
"pane-scrollbars-timeout"); "pane-scrollbars-timeout");
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;
evtimer_del(&wp->sb_auto_timer);
evtimer_add(&wp->sb_auto_timer, &tv); evtimer_add(&wp->sb_auto_timer, &tv);
} }