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

Change tty_cmd_* to use a window_pane.

pull/1/head
Nicholas Marriott 2009-02-11 07:02:34 +00:00
parent e444b0b92a
commit 91c9d95279
3 changed files with 99 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.265 2009-02-11 06:50:15 nicm Exp $ */ /* $Id: tmux.h,v 1.266 2009-02-11 07:02:34 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1012,8 +1012,8 @@ long long options_get_number(struct options *, const char *);
/* tty.c */ /* tty.c */
void tty_cursor(struct tty *, u_int, u_int, u_int); void tty_cursor(struct tty *, u_int, u_int, u_int);
void tty_cell( void tty_cell(struct tty *,
struct tty *, struct screen *, u_int, struct grid_cell *); struct screen *, u_int, const struct grid_cell *);
void tty_putcode(struct tty *, enum tty_code_code); void tty_putcode(struct tty *, enum tty_code_code);
void tty_putcode1(struct tty *, enum tty_code_code, int); void tty_putcode1(struct tty *, enum tty_code_code, int);
void tty_putcode2(struct tty *, enum tty_code_code, int, int); void tty_putcode2(struct tty *, enum tty_code_code, int, int);
@ -1027,10 +1027,10 @@ void tty_update_mode(struct tty *, int);
int tty_open(struct tty *, char **); int tty_open(struct tty *, char **);
void tty_close(struct tty *, int); void tty_close(struct tty *, int);
void tty_free(struct tty *, int); void tty_free(struct tty *, int);
void tty_write(struct tty *, void tty_write(
struct screen *, u_int, enum tty_cmd, ...); struct tty *, struct window_pane *, enum tty_cmd, ...);
void tty_vwrite(struct tty *, void tty_vwrite(
struct screen *, u_int, enum tty_cmd, va_list); struct tty *, struct window_pane *, enum tty_cmd, va_list);
/* tty-term.c */ /* tty-term.c */
extern struct tty_terms tty_terms; extern struct tty_terms tty_terms;

4
tty-write.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-write.c,v 1.10 2009-02-11 06:31:09 nicm Exp $ */ /* $Id: tty-write.c,v 1.11 2009-02-11 07:02:34 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -54,7 +54,7 @@ tty_vwrite_cmd(struct window_pane *wp, enum tty_cmd cmd, va_list ap)
if (c->session->curw->window == wp->window) { if (c->session->curw->window == wp->window) {
va_copy(aq, ap); va_copy(aq, ap);
tty_vwrite(&c->tty, wp->screen, wp->yoff, cmd, aq); tty_vwrite(&c->tty, wp, cmd, aq);
va_end(aq); va_end(aq);
} }
} }

177
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.66 2009-02-11 06:50:16 nicm Exp $ */ /* $Id: tty.c,v 1.67 2009-02-11 07:02:34 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -41,25 +41,21 @@ void tty_attributes(struct tty *, const struct grid_cell *);
void tty_attributes_fg(struct tty *, const struct grid_cell *); void tty_attributes_fg(struct tty *, const struct grid_cell *);
void tty_attributes_bg(struct tty *, const struct grid_cell *); void tty_attributes_bg(struct tty *, const struct grid_cell *);
void tty_cmd_bell(struct tty *, struct screen *, u_int, va_list); void tty_cmd_cell(struct tty *, struct window_pane *, va_list);
void tty_cmd_carriagereturn(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearendofline(struct tty *, struct window_pane *, va_list);
void tty_cmd_cell(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearendofscreen(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearendofline(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearline(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearendofscreen(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearscreen(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearline(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearstartofline(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearscreen(struct tty *, struct screen *, u_int, va_list); void tty_cmd_clearstartofscreen(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearstartofline(struct tty *, struct screen *, u_int, va_list); void tty_cmd_deletecharacter(struct tty *, struct window_pane *, va_list);
void tty_cmd_clearstartofscreen(struct tty *, struct screen *, u_int, va_list); void tty_cmd_deleteline(struct tty *, struct window_pane *, va_list);
void tty_cmd_deletecharacter(struct tty *, struct screen *, u_int, va_list); void tty_cmd_insertcharacter(struct tty *, struct window_pane *, va_list);
void tty_cmd_deleteline(struct tty *, struct screen *, u_int, va_list); void tty_cmd_insertline(struct tty *, struct window_pane *, va_list);
void tty_cmd_insertcharacter(struct tty *, struct screen *, u_int, va_list); void tty_cmd_linefeed(struct tty *, struct window_pane *, va_list);
void tty_cmd_insertline(struct tty *, struct screen *, u_int, va_list); void tty_cmd_reverseindex(struct tty *, struct window_pane *, va_list);
void tty_cmd_insertmode(struct tty *, struct screen *, u_int, va_list);
void tty_cmd_linefeed(struct tty *, struct screen *, u_int, va_list);
void tty_cmd_mousemode(struct tty *, struct screen *, u_int, va_list);
void tty_cmd_reverseindex(struct tty *, struct screen *, u_int, va_list);
void (*tty_cmds[])(struct tty *, struct screen *, u_int, va_list) = { void (*tty_cmds[])(struct tty *, struct window_pane *, va_list) = {
tty_cmd_cell, tty_cmd_cell,
tty_cmd_clearendofline, tty_cmd_clearendofline,
tty_cmd_clearendofscreen, tty_cmd_clearendofscreen,
@ -375,35 +371,35 @@ tty_emulate_repeat(
} }
void void
tty_write(struct tty *tty, struct screen *s, u_int oy, enum tty_cmd cmd, ...) tty_write(struct tty *tty, struct window_pane *wp, enum tty_cmd cmd, ...)
{ {
va_list ap; va_list ap;
va_start(ap, cmd); va_start(ap, cmd);
tty_vwrite(tty, s, oy, cmd, ap); tty_vwrite(tty, wp, cmd, ap);
va_end(ap); va_end(ap);
} }
void void
tty_vwrite( tty_vwrite(
struct tty *tty, struct screen *s, u_int oy, enum tty_cmd cmd, va_list ap) struct tty *tty, struct window_pane *wp, enum tty_cmd cmd, va_list ap)
{ {
if (tty->flags & TTY_FREEZE || tty->term == NULL) if (tty->flags & TTY_FREEZE || tty->term == NULL)
return; return;
if (tty_cmds[cmd] != NULL) if (tty_cmds[cmd] != NULL)
tty_cmds[cmd](tty, s, oy, ap); tty_cmds[cmd](tty, wp, ap);
} }
void void
tty_cmd_insertcharacter( tty_cmd_insertcharacter(struct tty *tty, struct window_pane *wp, va_list ap)
struct tty *tty, unused struct screen *s, u_int oy, va_list ap)
{ {
u_int ua; struct screen *s = wp->screen;
u_int ua;
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->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))
@ -413,150 +409,151 @@ tty_cmd_insertcharacter(
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, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
} }
} }
void void
tty_cmd_deletecharacter( tty_cmd_deletecharacter(struct tty *tty, struct window_pane *wp, va_list ap)
struct tty *tty, unused struct screen *s, u_int oy, va_list ap)
{ {
u_int ua; struct screen *s = wp->screen;
u_int ua;
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ua); tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ua);
} }
void void
tty_cmd_insertline( tty_cmd_insertline(struct tty *tty, struct window_pane *wp, va_list ap)
struct tty *tty, unused struct screen *s, u_int oy, va_list ap)
{ {
u_int ua; struct screen *s = wp->screen;
u_int ua;
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_region(tty, s, oy); tty_region(tty, s, wp->yoff);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_IL, TTYC_IL1, ua); tty_emulate_repeat(tty, TTYC_IL, TTYC_IL1, ua);
} }
void void
tty_cmd_deleteline( tty_cmd_deleteline(struct tty *tty, struct window_pane *wp, va_list ap)
struct tty *tty, unused struct screen *s, u_int oy, va_list ap)
{ {
u_int ua; struct screen *s = wp->screen;
u_int ua;
ua = va_arg(ap, u_int); ua = va_arg(ap, u_int);
tty_reset(tty); tty_reset(tty);
tty_region(tty, s, oy); tty_region(tty, s, wp->yoff);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
tty_emulate_repeat(tty, TTYC_DL, TTYC_DL1, ua); tty_emulate_repeat(tty, TTYC_DL, TTYC_DL1, ua);
} }
void void
tty_cmd_clearline( tty_cmd_clearline(struct tty *tty, struct window_pane *wp, unused va_list ap)
struct tty *tty, struct screen *s, u_int oy, unused va_list ap)
{ {
u_int i; struct screen *s = wp->screen;
u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
tty_putcode2(tty, TTYC_CUP, oy + s->cy, 0); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, 0);
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
tty_putcode2(tty, TTYC_CUP, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
} else { } else {
tty_putcode2(tty, TTYC_CUP, oy + s->cy, 0); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->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, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
} }
} }
void void
tty_cmd_clearendofline( tty_cmd_clearendofline(
struct tty *tty, struct screen *s, u_int oy, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
u_int i; struct screen *s = wp->screen;
u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->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, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
for (i = s->cx; i < screen_size_x(s); i++) for (i = s->cx; i < screen_size_x(s); i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
} }
} }
void void
tty_cmd_clearstartofline( tty_cmd_clearstartofline(
struct tty *tty, struct screen *s, u_int oy, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
u_int i; struct screen *s = wp->screen;
u_int i;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL1)) if (tty_term_has(tty->term, TTYC_EL1))
tty_putcode(tty, TTYC_EL1); tty_putcode(tty, TTYC_EL1);
else { else {
tty_putcode2(tty, TTYC_CUP, oy + s->cy, 0); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, 0);
for (i = 0; i < s->cx + 1; i++) for (i = 0; i < s->cx + 1; i++)
tty_putc(tty, ' '); tty_putc(tty, ' ');
tty_putcode2(tty, TTYC_CUP, oy + s->cy, s->cx); tty_putcode2(tty, TTYC_CUP, wp->yoff + s->cy, s->cx);
} }
} }
void void
tty_cmd_reverseindex( tty_cmd_reverseindex(struct tty *tty, struct window_pane *wp, unused va_list ap)
struct tty *tty, struct screen *s, u_int oy, unused va_list ap)
{ {
struct screen *s = wp->screen;
tty_reset(tty); tty_reset(tty);
tty_region(tty, s, oy); tty_region(tty, s, wp->yoff);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
tty_putcode(tty, TTYC_RI); tty_putcode(tty, TTYC_RI);
} }
void void
tty_cmd_linefeed(struct tty *tty, struct screen *s, u_int oy, unused va_list ap) tty_cmd_linefeed(struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
struct screen *s = wp->screen;
tty_reset(tty); tty_reset(tty);
tty_region(tty, s, oy); tty_region(tty, s, wp->yoff);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
tty_putc(tty, '\n'); tty_putc(tty, '\n');
tty->cy++; tty->cy++;
} }
void
tty_cmd_bell(struct tty *tty,
unused struct screen *s, unused u_int oy, unused va_list ap)
{
tty_putcode(tty, TTYC_BEL);
}
void void
tty_cmd_clearendofscreen( tty_cmd_clearendofscreen(
struct tty *tty, struct screen *s, u_int oy, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
u_int i, j; struct screen *s = wp->screen;
u_int i, j, oy;
oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, wp->yoff);
if (tty_term_has(tty->term, TTYC_EL)) { if (tty_term_has(tty->term, TTYC_EL)) {
for (i = oy + s->cy; i < oy + screen_size_y(s); i++) { for (i = oy + s->cy; i < oy + screen_size_y(s); i++) {
@ -577,9 +574,12 @@ tty_cmd_clearendofscreen(
void void
tty_cmd_clearstartofscreen( tty_cmd_clearstartofscreen(
struct tty *tty, struct screen *s, u_int oy, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
u_int i, j; struct screen *s = wp->screen;
u_int i, j, oy;
oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, oy);
@ -604,9 +604,12 @@ tty_cmd_clearstartofscreen(
void void
tty_cmd_clearscreen( tty_cmd_clearscreen(
struct tty *tty, struct screen *s, u_int oy, unused va_list ap) struct tty *tty, struct window_pane *wp, unused va_list ap)
{ {
u_int i, j; struct screen *s = wp->screen;
u_int i, j, oy;
oy = wp->yoff;
tty_reset(tty); tty_reset(tty);
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, oy);
@ -628,21 +631,21 @@ tty_cmd_clearscreen(
} }
void void
tty_cmd_cell(struct tty *tty, struct screen *s, u_int oy, va_list ap) tty_cmd_cell(struct tty *tty, struct window_pane *wp, va_list ap)
{ {
struct grid_cell *gc; struct grid_cell *gc;
gc = va_arg(ap, struct grid_cell *); gc = va_arg(ap, struct grid_cell *);
tty_cell(tty, s, oy, gc); tty_cell(tty, wp->screen, wp->yoff, gc);
} }
void void
tty_cell(struct tty *tty, struct screen *s, u_int oy, struct grid_cell *gc) tty_cell(
struct tty *tty, struct screen *s, u_int oy, const struct grid_cell *gc)
{ {
struct grid_cell *gc; u_int i, width;
u_int i, width; u_char out[4];
u_char out[4];
tty_cursor(tty, s->cx, s->cy, oy); tty_cursor(tty, s->cx, s->cy, oy);