From cbd3b1bc9b51d38c98fd02df8c489b7bc9dab728 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Thu, 15 Oct 2009 01:39:30 +0000
Subject: [PATCH] Sync OpenBSD patchset 400:

When backspace is received at the beginning of a line and the previous line was
wrapped, move the cursor back up to the end of the previous line.

Another one of the forgotten persons requested this quite a while ago (I need
to start noting names on todo items...) when it was quite hard to
implement. Now it is easy and I don't see it can do any harm, so hey presto...
---
 input.c        |  4 ++--
 screen-write.c | 22 +++++++++++++++++++++-
 tmux.h         |  3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/input.c b/input.c
index fcdd4597..9bee4b77 100644
--- a/input.c
+++ b/input.c
@@ -1,4 +1,4 @@
-/* $Id: input.c,v 1.95 2009-08-21 21:07:20 tcunha Exp $ */
+/* $Id: input.c,v 1.96 2009-10-15 01:39:30 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -646,7 +646,7 @@ input_handle_c0_control(u_char ch, struct input_ctx *ictx)
 		ictx->wp->window->flags |= WINDOW_BELL;
 		break;
 	case '\010': 	/* BS */
-		screen_write_cursorleft(&ictx->ctx, 1);
+		screen_write_backspace(&ictx->ctx);
 		break;
 	case '\011': 	/* TAB */
 		/* Don't tab beyond the end of the line. */
diff --git a/screen-write.c b/screen-write.c
index 5010e4fd..11b387a6 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.75 2009-10-15 01:35:35 tcunha Exp $ */
+/* $Id: screen-write.c,v 1.76 2009-10-15 01:39:30 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -513,6 +513,25 @@ screen_write_cursorleft(struct screen_write_ctx *ctx, u_int nx)
 	s->cx -= nx;
 }
 
+/* Backspace; cursor left unless at start of wrapped line when can move up. */
+void
+screen_write_backspace(struct screen_write_ctx *ctx)
+{
+	struct screen		*s = ctx->s;
+	struct grid_line	*gl;
+
+	if (s->cx == 0) {
+		if (s->cy == 0)
+			return;
+		gl = &s->grid->linedata[s->grid->hsize + s->cy - 1];
+		if (gl->flags & GRID_LINE_WRAPPED) {
+			s->cy--;
+			s->cx = screen_size_x(s) - 1;
+		}
+	} else
+		s->cx--;
+}
+
 /* VT100 alignment test. */
 void
 screen_write_alignmenttest(struct screen_write_ctx *ctx)
@@ -536,6 +555,7 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx)
 	s->cy = 0;
 
 	s->rupper = 0;
+
 	s->rlower = screen_size_y(s) - 1;
 
 	tty_write(tty_cmd_alignmenttest, &ttyctx);
diff --git a/tmux.h b/tmux.h
index 179a35cb..622c4868 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.473 2009-10-15 01:33:21 tcunha Exp $ */
+/* $Id: tmux.h,v 1.474 2009-10-15 01:39:30 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1644,6 +1644,7 @@ void	 screen_write_putc(
     	     struct screen_write_ctx *, struct grid_cell *, u_char);
 void	 screen_write_copy(struct screen_write_ctx *,
 	     struct screen *, u_int, u_int, u_int, u_int);
+void	 screen_write_backspace(struct screen_write_ctx *);
 void	 screen_write_cursorup(struct screen_write_ctx *, u_int);
 void	 screen_write_cursordown(struct screen_write_ctx *, u_int);
 void	 screen_write_cursorright(struct screen_write_ctx *, u_int);