mirror of
https://github.com/tmate-io/tmate.git
synced 2024-12-24 15:48:58 +01:00
Sync OpenBSD patchset 390:
Like linefeed, don't set the scroll region for reverse index unless it will be needed. While here, also tidy up a couple of long lines and remove an extraneous blank.
This commit is contained in:
parent
6ea6d1b29f
commit
f92cc84631
15
tty.c
15
tty.c
@ -1,4 +1,4 @@
|
||||
/* $Id: tty.c,v 1.141 2009-10-11 23:39:37 tcunha Exp $ */
|
||||
/* $Id: tty.c,v 1.142 2009-10-12 00:41:00 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -467,8 +467,10 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy)
|
||||
if (screen_check_selection(s, i, py)) {
|
||||
memcpy(&tmpgc, &s->sel.cell, sizeof tmpgc);
|
||||
tmpgc.data = gc->data;
|
||||
tmpgc.flags = gc->flags & ~(GRID_FLAG_FG256|GRID_FLAG_BG256);
|
||||
tmpgc.flags |= s->sel.cell.flags & (GRID_FLAG_FG256|GRID_FLAG_BG256);
|
||||
tmpgc.flags = gc->flags &
|
||||
~(GRID_FLAG_FG256|GRID_FLAG_BG256);
|
||||
tmpgc.flags |= s->sel.cell.flags &
|
||||
(GRID_FLAG_FG256|GRID_FLAG_BG256);
|
||||
tty_cell(tty, &tmpgc, gu);
|
||||
} else
|
||||
tty_cell(tty, gc, gu);
|
||||
@ -676,11 +678,9 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
|
||||
return;
|
||||
}
|
||||
|
||||
tty_reset(tty);
|
||||
|
||||
tty_region(tty, ctx->orupper, ctx->orlower, wp->yoff);
|
||||
|
||||
if (ctx->ocy == ctx->orupper) {
|
||||
tty_reset(tty);
|
||||
tty_region(tty, ctx->orupper, ctx->orlower, wp->yoff);
|
||||
tty_cursor(tty, ctx->ocx, ctx->orupper, wp->xoff, wp->yoff);
|
||||
tty_putcode(tty, TTYC_RI);
|
||||
}
|
||||
@ -698,7 +698,6 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (ctx->ocy == ctx->orlower) {
|
||||
tty_reset(tty);
|
||||
tty_region(tty, ctx->orupper, ctx->orlower, wp->yoff);
|
||||
|
Loading…
Reference in New Issue
Block a user