Don't save/restore ry_*.

This commit is contained in:
Nicholas Marriott 2007-10-26 17:15:50 +00:00
parent 4a325c8f93
commit ab097f0c0c
4 changed files with 10 additions and 15 deletions

View File

@ -1,5 +1,7 @@
26 October 2007 26 October 2007
* (nicm) Saving scroll region on \e7 causes problems with ncmpc so I guess
it is not required.
* (nicm) unlink-window command. * (nicm) unlink-window command.
* (nicm) link-window command to link an existing window into another session * (nicm) link-window command to link an existing window into another session
(or another index in the same session). Syntax: (or another index in the same session). Syntax:
@ -176,5 +178,5 @@
(including mutt, emacs). No status bar yet and no key remapping or other (including mutt, emacs). No status bar yet and no key remapping or other
customisation. customisation.
$Id: CHANGES,v 1.54 2007-10-26 16:57:32 nicm Exp $ $Id: CHANGES,v 1.55 2007-10-26 17:15:50 nicm Exp $

2
TODO
View File

@ -55,8 +55,6 @@
rename sessions rename sessions
swap windows swap windows
same as link but swap windows if tgt exists else error same as link but swap windows if tgt exists else error
unlink window (error if window only linked to one session)
tmux -s <sess> unlink-window -i<tgt idx>
kill session (not bound by default) kill session (not bound by default)
- fix most(1) problems after scrolling - fix most(1) problems after scrolling
- check for some reqd terminfo caps on startup - check for some reqd terminfo caps on startup

10
input.c
View File

@ -1,4 +1,4 @@
/* $Id: input.c,v 1.28 2007-10-24 15:40:59 nicm Exp $ */ /* $Id: input.c,v 1.29 2007-10-26 17:15:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -447,8 +447,6 @@ input_handle_private_two(u_char ch, struct input_ctx *ictx)
case '7': /* DECSC */ case '7': /* DECSC */
s->saved_cx = s->cx; s->saved_cx = s->cx;
s->saved_cy = s->cy; s->saved_cy = s->cy;
s->saved_ry_upper = s->ry_upper;
s->saved_ry_lower = s->ry_lower;
s->saved_attr = s->attr; s->saved_attr = s->attr;
s->saved_colr = s->colr; s->saved_colr = s->colr;
s->mode |= MODE_SAVED; s->mode |= MODE_SAVED;
@ -458,8 +456,6 @@ input_handle_private_two(u_char ch, struct input_ctx *ictx)
break; break;
s->cx = s->saved_cx; s->cx = s->saved_cx;
s->cy = s->saved_cy; s->cy = s->saved_cy;
s->ry_upper = s->saved_ry_upper;
s->ry_lower = s->saved_ry_lower;
s->attr = s->saved_attr; s->attr = s->saved_attr;
s->colr = s->saved_colr; s->colr = s->saved_colr;
input_store_two( input_store_two(
@ -1012,8 +1008,8 @@ input_handle_sequence_decstbm(struct input_ctx *ictx)
n = s->sy; n = s->sy;
if (m == 0) if (m == 0)
m = 1; m = 1;
if (m > s->sx) if (m > s->sy)
m = s->sx; m = s->sy;
if (n > m) { if (n > m) {
log_debug3("decstbm: out of range: %hu,%hu", n, m); log_debug3("decstbm: out of range: %hu,%hu", n, m);

9
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.73 2007-10-26 16:57:32 nicm Exp $ */ /* $Id: tmux.h,v 1.74 2007-10-26 17:15:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -341,17 +341,16 @@ struct screen {
u_int sx; /* size x */ u_int sx; /* size x */
u_int sy; /* size y */ u_int sy; /* size y */
u_int cx; /* cursor x */
u_int cy; /* cursor y */
u_int ry_upper; /* scroll region top */ u_int ry_upper; /* scroll region top */
u_int ry_lower; /* scroll region bottom */ u_int ry_lower; /* scroll region bottom */
u_int cx; /* cursor x */
u_int cy; /* cursor y */
u_char attr; u_char attr;
u_char colr; /* fg:bg */ u_char colr; /* fg:bg */
u_int saved_cx; u_int saved_cx;
u_int saved_cy; u_int saved_cy;
u_int saved_ry_upper;
u_int saved_ry_lower;
u_int saved_attr; u_int saved_attr;
u_int saved_colr; u_int saved_colr;