mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 400:

Browse Source 
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...
This commit is contained in:
Tiago Cunha
2009-10-15 01:39:30 +00:00
parent 04db3c6211
commit cbd3b1bc9b
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
input.c
View File

@@ -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> * 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; ictx->wp->window->flags |= WINDOW_BELL;
break; break;
case '\010': /* BS */ case '\010': /* BS */
screen_write_cursorleft(&ictx->ctx, 1); screen_write_backspace(&ictx->ctx);
break; break;
case '\011': /* TAB */ case '\011': /* TAB */
/* Don't tab beyond the end of the line. */ /* Don't tab beyond the end of the line. */

22
screen-write.c
View File

@@ -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> * 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; 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. */ /* VT100 alignment test. */
void void
screen_write_alignmenttest(struct screen_write_ctx *ctx) screen_write_alignmenttest(struct screen_write_ctx *ctx)
@@ -536,6 +555,7 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx)
s->cy = 0; s->cy = 0;
s->rupper = 0; s->rupper = 0;
s->rlower = screen_size_y(s) - 1; s->rlower = screen_size_y(s) - 1;
tty_write(tty_cmd_alignmenttest, &ttyctx); tty_write(tty_cmd_alignmenttest, &ttyctx);

3
tmux.h
View File

@@ -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> * 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); struct screen_write_ctx *, struct grid_cell *, u_char);
void screen_write_copy(struct screen_write_ctx *, void screen_write_copy(struct screen_write_ctx *,
struct screen *, u_int, u_int, u_int, u_int); 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_cursorup(struct screen_write_ctx *, u_int);
void screen_write_cursordown(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); void screen_write_cursorright(struct screen_write_ctx *, u_int);