extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-27 10:33:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 392:

Browse Source 
_absolute is redundant, just use tty_region.
This commit is contained in:
Tiago Cunha 2009-10-15 01:28:14 +00:00
parent 9b771a96f0
commit 6369fca253
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server.c
View File

@ -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 <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1053,7 +1053,7 @@ server_handle_client(struct client *c)
* tty_region/tty_reset/tty_update_mode already take care of not * tty_region/tty_reset/tty_update_mode already take care of not
* resetting things that are already in their default state. * 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"); status = options_get_number(oo, "status");
if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status) if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)

4
tmux.h
View File

@ -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 <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1246,7 +1246,7 @@ u_char tty_get_acs(struct tty *, u_char);
void tty_attributes(struct tty *, const struct grid_cell *); void tty_attributes(struct tty *, const struct grid_cell *);
void tty_reset(struct tty *); void tty_reset(struct tty *);
void tty_region_pane(struct tty *, const struct tty_ctx *, u_int, u_int); 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_cursor(struct tty *, u_int, u_int, u_int, u_int);
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);

8
tty.c
View File

@ -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 <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -898,17 +898,19 @@ tty_reset(struct tty *tty)
memcpy(gc, &grid_default_cell, sizeof *gc); memcpy(gc, &grid_default_cell, sizeof *gc);
} }
/* Set region inside pane. */
void void
tty_region_pane( tty_region_pane(
struct tty *tty, const struct tty_ctx *ctx, u_int rupper, u_int rlower) struct tty *tty, const struct tty_ctx *ctx, u_int rupper, u_int rlower)
{ {
struct window_pane *wp = ctx->wp; 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 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) if (tty->rlower == rlower && tty->rupper == rupper)
return; return;