From ab097f0c0c7cd6d30767fc63d05731197160aeeb Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Fri, 26 Oct 2007 17:15:50 +0000
Subject: [PATCH] Don't save/restore ry_*.

---
 CHANGES |  4 +++-
 TODO    |  2 --
 input.c | 10 +++-------
 tmux.h  |  9 ++++-----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index c908c444..d5d1bc50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 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) link-window command to link an existing window into another session
   (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
   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 $
 
diff --git a/TODO b/TODO
index 09149c20..8e31e77b 100644
--- a/TODO
+++ b/TODO
@@ -55,8 +55,6 @@
 	rename sessions
 	swap windows
 		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)
 - fix most(1) problems after scrolling
 - check for some reqd terminfo caps on startup
diff --git a/input.c b/input.c
index 7341e5b5..8f12e4f4 100644
--- a/input.c
+++ b/input.c
@@ -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>
@@ -447,8 +447,6 @@ input_handle_private_two(u_char ch, struct input_ctx *ictx)
 	case '7':	/* DECSC */
 		s->saved_cx = s->cx;
 		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_colr = s->colr;
 		s->mode |= MODE_SAVED;
@@ -458,8 +456,6 @@ input_handle_private_two(u_char ch, struct input_ctx *ictx)
 			break;
 		s->cx = s->saved_cx;
 		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->colr = s->saved_colr;
 		input_store_two(
@@ -1012,8 +1008,8 @@ input_handle_sequence_decstbm(struct input_ctx *ictx)
 		n = s->sy;
 	if (m == 0)
 		m = 1;
-	if (m > s->sx)
-		m = s->sx;
+	if (m > s->sy)
+		m = s->sy;
 
 	if (n > m) {
 		log_debug3("decstbm: out of range: %hu,%hu", n, m);
diff --git a/tmux.h b/tmux.h
index 327a612e..89a1bf0f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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>
@@ -341,17 +341,16 @@ struct screen {
  	u_int		 sx;		/* size x */
 	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_lower;	/* scroll region bottom */
+
+	u_int		 cx;		/* cursor x */
+	u_int		 cy;		/* cursor y */
 	u_char		 attr;
 	u_char		 colr;		/* fg:bg */
 
 	u_int		 saved_cx;
 	u_int		 saved_cy;
-	u_int		 saved_ry_upper;
-	u_int		 saved_ry_lower;
 	u_int		 saved_attr;
 	u_int		 saved_colr;