From 6369fca253fe4e289cbf0a1b8e1c5b52d7875e80 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Thu, 15 Oct 2009 01:28:14 +0000 Subject: [PATCH] Sync OpenBSD patchset 392: _absolute is redundant, just use tty_region. --- server.c | 4 ++-- tmux.h | 4 ++-- tty.c | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server.c b/server.c index 670035a9..03c79d78 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.207 2009-10-15 01:26:50 tcunha Exp $ */ +/* $Id: server.c,v 1.208 2009-10-15 01:28:14 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1053,7 +1053,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/tmux.h b/tmux.h index 696b6b43..73423c23 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.470 2009-10-15 01:26:50 tcunha Exp $ */ +/* $Id: tmux.h,v 1.471 2009-10-15 01:28:14 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1246,7 +1246,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/tty.c b/tty.c index ede91f93..dd1c0ea5 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.143 2009-10-15 01:26:50 tcunha Exp $ */ +/* $Id: tty.c,v 1.144 2009-10-15 01:28:14 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -898,17 +898,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;