circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 02:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Don't die when backspacing off the edge of the screen, reported by David Chisnall..

Browse Source
This commit is contained in:
Nicholas Marriott 2009-01-06 18:07:57 +00:00
parent 4af8db90e8
commit d7e0ea5cc6
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
screen-write.c
View File

@ -1,4 +1,4 @@
/* $Id: screen-write.c,v 1.18 2009-01-05 11:04:06 nicm Exp $ */ /* $Id: screen-write.c,v 1.19 2009-01-06 18:07:57 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -131,10 +131,13 @@ screen_write_cursorup(struct screen_write_ctx *ctx, u_int ny)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (ny == 0)
ny = 1;
if (ny > s->cy) if (ny > s->cy)
ny = s->cy; ny = s->cy;
if (ny == 0) if (ny == 0)
ny = 1; return;
s->cy -= ny; s->cy -= ny;
@ -148,10 +151,13 @@ screen_write_cursordown(struct screen_write_ctx *ctx, u_int ny)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (ny == 0)
ny = 1;
if (ny > screen_size_y(s) - 1 - s->cy) if (ny > screen_size_y(s) - 1 - s->cy)
ny = screen_size_y(s) - 1 - s->cy; ny = screen_size_y(s) - 1 - s->cy;
if (ny == 0) if (ny == 0)
ny = 1; return;
s->cy += ny; s->cy += ny;
@ -165,10 +171,13 @@ screen_write_cursorright(struct screen_write_ctx *ctx, u_int nx)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (nx == 0)
nx = 1;
if (nx > screen_size_x(s) - 1 - s->cx) if (nx > screen_size_x(s) - 1 - s->cx)
nx = screen_size_x(s) - 1 - s->cx; nx = screen_size_x(s) - 1 - s->cx;
if (nx == 0) if (nx == 0)
nx = 1; return;
s->cx += nx; s->cx += nx;
@ -182,10 +191,13 @@ screen_write_cursorleft(struct screen_write_ctx *ctx, u_int nx)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (nx == 0)
nx = 1;
if (nx > s->cx) if (nx > s->cx)
nx = s->cx; nx = s->cx;
if (nx == 0) if (nx == 0)
nx = 1; return;
s->cx -= nx; s->cx -= nx;
@ -199,10 +211,13 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (nx == 0)
nx = 1;
if (nx > screen_size_x(s) - 1 - s->cx) if (nx > screen_size_x(s) - 1 - s->cx)
nx = screen_size_x(s) - 1 - s->cx; nx = screen_size_x(s) - 1 - s->cx;
if (nx == 0) if (nx == 0)
nx = 1; return;
grid_view_insert_cells(s->grid, s->cx, s->cy, nx); grid_view_insert_cells(s->grid, s->cx, s->cy, nx);
@ -216,10 +231,13 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (nx == 0)
nx = 1;
if (nx > screen_size_x(s) - 1 - s->cx) if (nx > screen_size_x(s) - 1 - s->cx)
nx = screen_size_x(s) - 1 - s->cx; nx = screen_size_x(s) - 1 - s->cx;
if (nx == 0) if (nx == 0)
nx = 1; return;
grid_view_delete_cells(s->grid, s->cx, s->cy, nx); grid_view_delete_cells(s->grid, s->cx, s->cy, nx);
@ -233,10 +251,13 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (ny == 0)
ny = 1;
if (ny > screen_size_y(s) - 1 - s->cy) if (ny > screen_size_y(s) - 1 - s->cy)
ny = screen_size_y(s) - 1 - s->cy; ny = screen_size_y(s) - 1 - s->cy;
if (ny == 0) if (ny == 0)
ny = 1; return;
if (s->cy < s->rupper || s->cy > s->rlower) if (s->cy < s->rupper || s->cy > s->rlower)
grid_view_insert_lines(s->grid, s->cy, ny); grid_view_insert_lines(s->grid, s->cy, ny);
@ -255,10 +276,13 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
if (ny == 0)
ny = 1;
if (ny > screen_size_y(s) - 1 - s->cy) if (ny > screen_size_y(s) - 1 - s->cy)
ny = screen_size_y(s) - 1 - s->cy; ny = screen_size_y(s) - 1 - s->cy;
if (ny == 0) if (ny == 0)
ny = 1; return;
if (s->cy < s->rupper || s->cy > s->rlower) if (s->cy < s->rupper || s->cy > s->rlower)
grid_view_delete_lines(s->grid, s->cy, ny); grid_view_delete_lines(s->grid, s->cy, ny);