summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-12 09:17:00 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-12 09:17:00 +0000
commit8e5e41d4e5e420668f51ba6a0b1d7efef91b6c72 (patch)
treedb15c3366ac42c25fb980028b68cf91ef34c64b6 /usr.bin/tmux
parent2fdbe83ee7fa5479bde5f49e2fc2868a96cdea95 (diff)
_absolute is redundant, just use tty_region.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/server.c4
-rw-r--r--usr.bin/tmux/tmux.h4
-rw-r--r--usr.bin/tmux/tty.c8
3 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 4884a4a3f77..d27d08de8b7 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.56 2009/10/12 09:09:35 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.57 2009/10/12 09:16:59 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1050,7 +1050,7 @@ server_handle_client(struct client *c)
* tty_region/tty_reset/tty_update_mode already take care of not
* resetting things that are already in their default state.
*/
- tty_region_absolute(&c->tty, 0, c->tty.sy - 1);
+ tty_region(&c->tty, 0, c->tty.sy - 1);
status = options_get_number(oo, "status");
if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 14d1786f67c..499a741b88f 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.132 2009/10/12 09:09:35 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.133 2009/10/12 09:16:59 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1248,7 +1248,7 @@ u_char tty_get_acs(struct tty *, u_char);
void tty_attributes(struct tty *, const struct grid_cell *);
void tty_reset(struct tty *);
void tty_region_pane(struct tty *, const struct tty_ctx *, u_int, u_int);
-void tty_region_absolute(struct tty *, u_int, u_int);
+void tty_region(struct tty *, u_int, u_int);
void tty_cursor(struct tty *, u_int, u_int, u_int, u_int);
void tty_putcode(struct tty *, enum tty_code_code);
void tty_putcode1(struct tty *, enum tty_code_code, int);
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 7761adbc642..65147dc410e 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.39 2009/10/12 09:09:35 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.40 2009/10/12 09:16:59 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -893,17 +893,19 @@ tty_reset(struct tty *tty)
memcpy(gc, &grid_default_cell, sizeof *gc);
}
+/* Set region inside pane. */
void
tty_region_pane(
struct tty *tty, const struct tty_ctx *ctx, u_int rupper, u_int rlower)
{
struct window_pane *wp = ctx->wp;
- tty_region_absolute(tty, wp->yoff + rupper, wp->yoff + rlower);
+ tty_region(tty, wp->yoff + rupper, wp->yoff + rlower);
}
+/* Set region at absolute position. */
void
-tty_region_absolute(struct tty *tty, u_int rupper, u_int rlower)
+tty_region(struct tty *tty, u_int rupper, u_int rlower)
{
if (tty->rlower == rlower && tty->rupper == rupper)
return;