From 5e4d9a3197a229ecb30d51f5b7e6756ef31dc1d2 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 27 Mar 2013 11:19:19 +0000
Subject: [PATCH] Move the cursor back into the last column on CUU/CUD to match
 xterm behaviour. From George Nachman.

---
 screen-write.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/screen-write.c b/screen-write.c
index 348065c6..c0935c95 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -488,6 +488,8 @@ screen_write_cursorup(struct screen_write_ctx *ctx, u_int ny)
 		if (ny > s->cy - s->rupper)
 			ny = s->cy - s->rupper;
 	}
+	if (s->cx == screen_size_x(s))
+	    s->cx--;
 	if (ny == 0)
 		return;
 
@@ -512,6 +514,8 @@ screen_write_cursordown(struct screen_write_ctx *ctx, u_int ny)
 		if (ny > s->rlower - s->cy)
 			ny = s->rlower - s->cy;
 	}
+	if (s->cx == screen_size_x(s))
+	    s->cx--;
 	if (ny == 0)
 		return;