circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lose unnecessary cursor restores, fix a couple of placement bugs and remove unused CR.

pull/1/head
Nicholas Marriott 2009-02-11 18:44:08 +00:00
parent 03d531ebc6
commit 6c76aaca92
3 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.268 2009-02-11 17:50:36 nicm Exp $ */ /* $Id: tmux.h,v 1.269 2009-02-11 18:44:05 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -240,7 +240,6 @@ enum tty_code_code {
TTYC_CLEAR, /* clear_screen, cl */ TTYC_CLEAR, /* clear_screen, cl */
TTYC_CNORM, /* cursor_normal, ve */ TTYC_CNORM, /* cursor_normal, ve */
TTYC_COLORS, /* max_colors, Co */ TTYC_COLORS, /* max_colors, Co */
TTYC_CR, /* carriage_return, cr */
TTYC_CSR, /* change_scroll_region, cs */ TTYC_CSR, /* change_scroll_region, cs */
TTYC_CUD, /* parm_down_cursor, DO */ TTYC_CUD, /* parm_down_cursor, DO */
TTYC_CUD1, /* cursor_down, do */ TTYC_CUD1, /* cursor_down, do */

7
tty-term.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-term.c,v 1.10 2009-02-11 17:08:09 nicm Exp $ */ /* $Id: tty-term.c,v 1.11 2009-02-11 18:44:08 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -39,7 +39,6 @@ struct tty_term_code_entry tty_term_codes[NTTYCODE] = {
{ TTYC_CLEAR, TTYCODE_STRING, "clear" }, { TTYC_CLEAR, TTYCODE_STRING, "clear" },
{ TTYC_CNORM, TTYCODE_STRING, "cnorm" }, { TTYC_CNORM, TTYCODE_STRING, "cnorm" },
{ TTYC_COLORS, TTYCODE_NUMBER, "colors" }, { TTYC_COLORS, TTYCODE_NUMBER, "colors" },
{ TTYC_CR, TTYCODE_STRING, "cr" },
{ TTYC_CSR, TTYCODE_STRING, "csr" }, { TTYC_CSR, TTYCODE_STRING, "csr" },
{ TTYC_CUD, TTYCODE_STRING, "cud" }, { TTYC_CUD, TTYCODE_STRING, "cud" },
{ TTYC_CUD1, TTYCODE_STRING, "cud1" }, { TTYC_CUD1, TTYCODE_STRING, "cud1" },
@ -237,10 +236,6 @@ tty_term_find(char *name, int fd, char **cause)
xasprintf(cause, "terminal does not support clear"); xasprintf(cause, "terminal does not support clear");
goto error; goto error;
} }
if (!tty_term_has(term, TTYC_CR)) {
xasprintf(cause, "terminal does not support cr");
goto error;
}
if (!tty_term_has(term, TTYC_RI)) { if (!tty_term_has(term, TTYC_RI)) {
xasprintf(cause, "terminal does not support ri"); xasprintf(cause, "terminal does not support ri");
goto error; goto error;

89
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.68 2009-02-11 17:04:39 nicm Exp $ */ /* $Id: tty.c,v 1.69 2009-02-11 18:44:08 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -397,8 +397,8 @@ tty_cmd_insertcharacter(struct tty *tty, struct window_pane *wp, va_list ap)
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_ICH) || if (tty_term_has(tty->term, TTYC_ICH) ||
tty_term_has(tty->term, TTYC_ICH1)) tty_term_has(tty->term, TTYC_ICH1))
tty_emulate_repeat(tty, TTYC_ICH, TTYC_ICH1, ua); tty_emulate_repeat(tty, TTYC_ICH, TTYC_ICH1, ua);
@ -407,7 +407,6 @@ tty_cmd_insertcharacter(struct tty *tty, struct window_pane *wp, va_list ap)
while (ua-- > 0) while (ua-- > 0)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode(tty, TTYC_RMIR); tty_putcode(tty, TTYC_RMIR);
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
} }
} }
@ -420,8 +419,8 @@ tty_cmd_deletecharacter(struct tty *tty, struct window_pane *wp, va_list ap)
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ua); tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ua);
} }
@ -434,9 +433,10 @@ tty_cmd_insertline(struct tty *tty, struct window_pane *wp, va_list ap)
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_IL, TTYC_IL1, ua); tty_emulate_repeat(tty, TTYC_IL, TTYC_IL1, ua);
} }
@ -449,9 +449,10 @@ tty_cmd_deleteline(struct tty *tty, struct window_pane *wp, va_list ap)
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_DL, TTYC_DL1, ua); tty_emulate_repeat(tty, TTYC_DL, TTYC_DL1, ua);
} }
@ -462,17 +463,13 @@ tty_cmd_clearline(struct tty *tty, struct window_pane *wp, unused va_list ap)
u_int i; u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_cursor(tty, 0, s->old_cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, 0);
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
} else { } else {
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, 0);
for (i = 0; i < screen_size_x(s); i++) for (i = 0; i < screen_size_x(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
} }
} }
@ -484,15 +481,13 @@ tty_cmd_clearendofline(
u_int i; u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) if (tty_term_has(tty->term, TTYC_EL))
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
else { else {
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
for (i = s->old_cx; i < screen_size_x(s); i++) for (i = s->old_cx; i < screen_size_x(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
} }
} }
@ -504,15 +499,14 @@ tty_cmd_clearstartofline(
u_int i; u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL1)) if (tty_term_has(tty->term, TTYC_EL1)) {
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_putcode(tty, TTYC_EL1); tty_putcode(tty, TTYC_EL1);
else { } else {
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, 0); tty_cursor(tty, 0, s->old_cy, wp->yoff);
for (i = 0; i < s->old_cx + 1; i++) for (i = 0; i < s->old_cx + 1; i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, wp->yoff + s->old_cy, s->old_cx);
} }
} }
@ -522,9 +516,10 @@ tty_cmd_reverseindex(struct tty *tty, struct window_pane *wp, unused va_list ap)
struct screen *s = wp->screen; struct screen *s = wp->screen;
tty_reset(tty); tty_reset(tty);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_putcode(tty, TTYC_RI); tty_putcode(tty, TTYC_RI);
} }
@ -534,10 +529,12 @@ tty_cmd_linefeed(struct tty *tty, struct window_pane *wp, unused va_list ap)
struct screen *s = wp->screen; struct screen *s = wp->screen;
tty_reset(tty); tty_reset(tty);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_putc(tty, '\n'); tty_putc(tty, '\n');
tty->cy++; tty->cy++;
} }
@ -551,23 +548,29 @@ tty_cmd_clearendofscreen(
oy = wp->yoff; oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
tty_cursor(tty, s->old_cx, s->old_cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
for (i = oy + s->old_cy; i < oy + screen_size_y(s); i++) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
if (i != screen_size_y(s) - 1) if (s->old_cy != screen_size_y(s) - 1) {
tty_putc(tty, '\r');
tty_putc(tty, '\n');
}
for (i = s->old_cy + 1; i < screen_size_y(s); i++) {
tty_putcode(tty, TTYC_EL);
if (i != screen_size_y(s) - 1) {
tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1); tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1);
tty->cy++;
}
} }
} else { } else {
for (i = s->old_cx; i < screen_size_y(s); i++) for (i = s->old_cx; i < screen_size_y(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
for (j = oy + s->old_cy; j < oy + screen_size_y(s); j++) { for (j = s->old_cy; j < screen_size_y(s); j++) {
for (i = 0; i < screen_size_x(s); i++) for (i = 0; i < screen_size_x(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
} }
} }
tty_putcode2(tty, TTYC_CUP, oy + s->old_cy, s->old_cx);
} }
void void
@ -575,29 +578,25 @@ tty_cmd_clearstartofscreen(
struct tty *tty, struct window_pane *wp, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
struct screen *s = wp->screen; struct screen *s = wp->screen;
u_int i, j, oy; u_int i, j;
oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, oy);
tty_putcode2(tty, TTYC_CUP, oy, 0); tty_cursor(tty, 0, 0, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
for (i = 0; i < oy + s->old_cy; i++) { for (i = 0; i < s->old_cy; i++) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1); tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1);
tty->cy++;
} }
tty_putcode2(tty, TTYC_CUP, oy + s->old_cy, 0);
} else { } else {
for (j = 0; j < oy + s->old_cy; j++) { for (j = 0; j < s->old_cy; j++) {
for (i = 0; i < screen_size_x(s); i++) for (i = 0; i < screen_size_x(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
} }
} }
for (i = 0; i < s->old_cx; i++) for (i = 0; i < s->old_cx; i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, oy + s->old_cy, s->old_cx);
} }
void void
@ -605,19 +604,18 @@ tty_cmd_clearscreen(
struct tty *tty, struct window_pane *wp, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
struct screen *s = wp->screen; struct screen *s = wp->screen;
u_int i, j, oy; u_int i, j;
oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->old_cx, s->old_cy, oy);
tty_putcode2(tty, TTYC_CUP, oy, 0); tty_cursor(tty, 0, 0, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
for (i = 0; i < screen_size_y(s); i++) { for (i = 0; i < screen_size_y(s); i++) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
if (i != screen_size_y(s) - 1) if (i != screen_size_y(s) - 1) {
tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1); tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1);
tty->cy++;
}
} }
} else { } else {
for (j = 0; j < screen_size_y(s); j++) { for (j = 0; j < screen_size_y(s); j++) {
@ -625,7 +623,6 @@ tty_cmd_clearscreen(
tty_putc(tty, ' '); tty_putc(tty, ' ');
} }
} }
tty_putcode2(tty, TTYC_CUP, oy + s->old_cy, s->old_cx);
} }
void void