From 664a0bd55925a741ee642ba8b7fe13e929daa7c8 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 9 Jul 2009 18:08:13 +0000
Subject: [PATCH] Cursor up and down should be limited by the scroll region
 (cuu should stop at the scroll region top if starting from below it and cud
 stop at the bottom if starting from above). Fixes another vttest test.

---
 screen-write.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/screen-write.c b/screen-write.c
index 9f37561f..5e73a4c1 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.58 2009-07-09 18:04:53 nicm Exp $ */
+/* $Id: screen-write.c,v 1.59 2009-07-09 18:08:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -232,8 +232,15 @@ screen_write_cursorup(struct screen_write_ctx *ctx, u_int ny)
 	if (ny == 0)
 		ny = 1;
 
-	if (ny > s->cy)
-		ny = s->cy;
+	if (s->cy < s->rupper) {
+		/* Above region. */
+		if (ny > s->cy)
+			ny = s->cy;
+	} else {
+		/* Below region. */
+		if (ny > s->cy - s->rupper)
+			ny = s->cy - s->rupper;
+	}
 	if (ny == 0)
 		return;
 
@@ -249,8 +256,15 @@ screen_write_cursordown(struct screen_write_ctx *ctx, u_int ny)
 	if (ny == 0)
 		ny = 1;
 
-	if (ny > screen_size_y(s) - 1 - s->cy)
-		ny = screen_size_y(s) - 1 - s->cy;
+	if (s->cy > s->rlower) {
+		/* Below region. */
+		if (ny > screen_size_y(s) - 1 - s->cy)
+			ny = screen_size_y(s) - 1 - s->cy;
+	} else {
+		/* Above region. */
+		if (ny > s->rlower - s->cy)
+			ny = s->rlower - s->cy;
+	}
 	if (ny == 0)
 		return;