circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-20 03:18:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-05-13 10:01:16 +01:00
commit 58f8421eac
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grid.c
View File

@ -286,7 +286,7 @@ grid_clear_history(struct grid *gd)
void void
grid_scroll_history_region(struct grid *gd, u_int upper, u_int lower, u_int bg) grid_scroll_history_region(struct grid *gd, u_int upper, u_int lower, u_int bg)
{ {
struct grid_line *gl_history, *gl_upper, *gl_lower; struct grid_line *gl_history, *gl_upper;
u_int yy; u_int yy;
/* Create a space for a new line. */ /* Create a space for a new line. */
@ -302,7 +302,6 @@ grid_scroll_history_region(struct grid *gd, u_int upper, u_int lower, u_int bg)
upper++; upper++;
gl_upper = &gd->linedata[upper]; gl_upper = &gd->linedata[upper];
lower++; lower++;
gl_lower = &gd->linedata[lower];
/* Move the line into the history. */ /* Move the line into the history. */
memcpy(gl_history, gl_upper, sizeof *gl_history); memcpy(gl_history, gl_upper, sizeof *gl_history);

7
tty.c
View File

@ -838,7 +838,7 @@ tty_clear_area(struct tty *tty, const struct window_pane *wp, u_int py,
tty_term_has(tty->term, TTYC_INDN)) { tty_term_has(tty->term, TTYC_INDN)) {
tty_region(tty, py, py + ny - 1); tty_region(tty, py, py + ny - 1);
tty_margin_off(tty); tty_margin_off(tty);
tty_putcode1(tty, TTYC_INDN, ny); tty_putcode1(tty, TTYC_INDN, ny - 1);
return; return;
} }
@ -853,7 +853,7 @@ tty_clear_area(struct tty *tty, const struct window_pane *wp, u_int py,
tty_term_has(tty->term, TTYC_INDN)) { tty_term_has(tty->term, TTYC_INDN)) {
tty_region(tty, py, py + ny - 1); tty_region(tty, py, py + ny - 1);
tty_margin(tty, px, px + nx - 1); tty_margin(tty, px, px + nx - 1);
tty_putcode1(tty, TTYC_INDN, ny); tty_putcode1(tty, TTYC_INDN, ny - 1);
return; return;
} }
} }
@ -1145,11 +1145,10 @@ void
tty_cmd_clearstartofline(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_clearstartofline(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
u_int nx, py = ctx->yoff + ctx->ocy; u_int py = ctx->yoff + ctx->ocy;
tty_default_attributes(tty, wp, ctx->bg); tty_default_attributes(tty, wp, ctx->bg);
nx = screen_size_x(wp->screen) - ctx->ocx;
tty_clear_line(tty, wp, py, ctx->xoff, ctx->ocx + 1, ctx->bg); tty_clear_line(tty, wp, py, ctx->xoff, ctx->ocx + 1, ctx->bg);
} }