diff options
| author |   nicm <nicm@openbsd.org> | 2009-10-12 09:29:58 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-10-12 09:29:58 +0000 |
| commit | c222f54155ce527fce9090acd3921dd96d5f85d5 (patch) | |
| tree | f634ac46e08e78009f9e5bd40b0804b2552101c1 /usr.bin/tmux/screen-redraw.c | |
| parent | _absolute is redundant, just use tty_region. (diff) | |
| download | wireguard-openbsd-c222f54155ce527fce9090acd3921dd96d5f85d5.tar.xz wireguard-openbsd-c222f54155ce527fce9090acd3921dd96d5f85d5.zip | |
Similarly add a tty_cursor_pane function to tidy up most of the calls.
Diffstat (limited to 'usr.bin/tmux/screen-redraw.c')
| -rw-r--r-- | usr.bin/tmux/screen-redraw.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/tmux/screen-redraw.c b/usr.bin/tmux/screen-redraw.c index d3bdd6dc67b..3514964cfb9 100644 --- a/usr.bin/tmux/screen-redraw.c +++ b/usr.bin/tmux/screen-redraw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen-redraw.c,v 1.11 2009/09/10 17:16:24 nicm Exp $ */ +/* $OpenBSD: screen-redraw.c,v 1.12 2009/10/12 09:29:58 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -195,7 +195,7 @@ screen_redraw_screen(struct client *c, int status_only) for (i = 0; i < tty->sx; i++) { type = screen_redraw_check_cell(c, i, j); if (type != CELL_INSIDE) { - tty_cursor(tty, i, j, 0, 0); + tty_cursor(tty, i, j); tty_putc(tty, border[type]); } } @@ -239,7 +239,7 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp) struct tty *tty = &c->tty; struct session *s = c->session; struct grid_cell gc; - u_int idx, px, py, i, j; + u_int idx, px, py, i, j, xoff, yoff; int colour; char buf[16], *ptr; size_t len; @@ -251,10 +251,11 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp) return; colour = options_get_number(&s->options, "display-panes-colour"); - px = wp->sx / 2; - py = wp->sy / 2; + px = wp->sx / 2; py = wp->sy / 2; + xoff = wp->xoff; yoff = wp->yoff; + if (wp->sx < len * 6 || wp->sy < 5) { - tty_cursor(tty, px - len / 2, py, wp->xoff, wp->yoff); + tty_cursor(tty, xoff + px - len / 2, yoff + py); memcpy(&gc, &grid_default_cell, sizeof gc); colour_set_fg(&gc, colour); tty_attributes(tty, &gc); @@ -275,7 +276,7 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp) for (j = 0; j < 5; j++) { for (i = px; i < px + 5; i++) { - tty_cursor(tty, i, py + j, wp->xoff, wp->yoff); + tty_cursor(tty, xoff + i, yoff + py + j); if (clock_table[idx][j][i - px]) tty_putc(tty, ' '); } |