billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=1f3f779258c86b170edb3e634548a446fe5c9b58
commit 1f3f779258c86b170edb3e634548a446fe5c9b58
Author: Boris Faure <bill...@gmail.com>
Date: Tue Jun 2 22:48:50 2015 +0200
ensure cursor coordinates are always valid
---
src/bin/termpty.c | 28 ++++++++++++----------------
src/bin/termpty.h | 8 ++++++++
src/bin/termptyesc.c | 46 ++++++++++++++++++++++++++--------------------
src/bin/termptyops.c | 13 ++++++++++++-
4 files changed, 58 insertions(+), 37 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index c9b8b7d..5e49ba4 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -270,21 +270,14 @@ _cb_fd_read(void *data, Ecore_Fd_Handler *fd_handler
EINA_UNUSED)
static void
_limit_coord(Termpty *ty)
{
- ty->termstate.wrapnext = 0;
- if (ty->termstate.had_cr_x >= ty->w)
- ty->termstate.had_cr_x = ty->w - 1;
- if (ty->termstate.had_cr_y >= ty->h)
- ty->termstate.had_cr_y = ty->h - 1;
-
- if (ty->cursor_state.cx >= ty->w)
- ty->cursor_state.cx = ty->w - 1;
- if (ty->cursor_state.cy >= ty->h)
- ty->cursor_state.cy = ty->h - 1;
-
- if (ty->cursor_save.cx >= ty->w)
- ty->cursor_save.cx = ty->w - 1;
- if (ty->cursor_save.cy >= ty->h)
- ty->cursor_save.cy = ty->h - 1;
+ TERMPTY_RESTRICT_FIELD(ty->termstate.had_cr_x, 0, ty->w);
+ TERMPTY_RESTRICT_FIELD(ty->termstate.had_cr_y, 0, ty->h);
+
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
+
+ TERMPTY_RESTRICT_FIELD(ty->cursor_save.cx, 0, ty->w);
+ TERMPTY_RESTRICT_FIELD(ty->cursor_save.cy, 0, ty->h);
}
Termpty *
@@ -897,7 +890,10 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
ty->cursor_state.cy = (new_cy + new_h - ty->circular_offset) % new_h;
- if (altbuf) termpty_screen_swap(ty);
+ if (altbuf)
+ termpty_screen_swap(ty);
+
+ ty->termstate.wrapnext = 0;
_limit_coord(ty);
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index d5aad70..7aba97a 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -260,4 +260,12 @@ extern int _termpty_log_dom;
#define TERMPTY_FMTCLR(Tatt) \
(Tatt).autowrapped = (Tatt).newline = (Tatt).tab = 0
+#define TERMPTY_RESTRICT_FIELD(Field, Min, Max) \
+ do { \
+ if (Field >= Max) \
+ Field = Max - 1; \
+ else if (Field < Min) \
+ Field = Min; \
+ } while (0)
+
#endif
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 14dbbb7..6de1340 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -66,7 +66,7 @@ _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
ty->termstate.had_cr = 0;
ty->termstate.wrapnext = 0;
ty->cursor_state.cx--;
- if (ty->cursor_state.cx < 0) ty->cursor_state.cx = 0;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
return;
case 0x09: // HT '\t' (horizontal tab)
DBG("->HT");
@@ -75,8 +75,7 @@ _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
ty->termstate.wrapnext = 0;
ty->cursor_state.cx += 8;
ty->cursor_state.cx = (ty->cursor_state.cx / 8) * 8;
- if (ty->cursor_state.cx >= ty->w)
- ty->cursor_state.cx = ty->w - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
return;
case 0x0a: // LF '\n' (new line)
case 0x0b: // VT '\v' (vertical tab)
@@ -91,6 +90,7 @@ _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
ty->termstate.wrapnext = 0;
if (ty->termstate.crlf) ty->cursor_state.cx = 0;
ty->cursor_state.cy++;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
termpty_text_scroll_test(ty, EINA_TRUE);
return;
case 0x0d: // CR '\r' (carriage ret)
@@ -682,6 +682,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
termpty_text_append(ty, blank, 1);
ty->termstate.insert = pi;
ty->cursor_state.cx = cx;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
}
break;
case 'A': // cursor up N
@@ -691,6 +692,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("cursor up %d", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cy = MAX(0, ty->cursor_state.cy - arg);
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
break;
case 'B': // cursor down N
arg = _csi_arg_get(&b);
@@ -698,6 +700,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("cursor down %d", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cy = MIN(ty->h - 1, ty->cursor_state.cy + arg);
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
break;
case 'D': // cursor left N
arg = _csi_arg_get(&b);
@@ -705,10 +708,8 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("cursor left %d", arg);
ty->termstate.wrapnext = 0;
for (i = 0; i < arg; i++)
- {
- ty->cursor_state.cx--;
- if (ty->cursor_state.cx < 0) ty->cursor_state.cx = 0;
- }
+ ty->cursor_state.cx--;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
break;
case 'C': // cursor right N
case 'a': // cursor right N
@@ -717,10 +718,8 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("cursor right %d", arg);
ty->termstate.wrapnext = 0;
for (i = 0; i < arg; i++)
- {
- ty->cursor_state.cx++;
- if (ty->cursor_state.cx >= ty->w) ty->cursor_state.cx = ty->w - 1;
- }
+ ty->cursor_state.cx++;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
break;
case 'H': // cursor pos set
case 'f': // cursor pos set
@@ -740,6 +739,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
if (b)
{
ty->cursor_state.cy = arg;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
arg = _csi_arg_get(&b);
if (arg < 1) arg = 1;
arg--;
@@ -747,9 +747,14 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
else arg = 0;
if (arg >= ty->w) arg = ty->w - 1;
- if (b) ty->cursor_state.cx = arg;
+ if (b)
+ {
+ ty->cursor_state.cx = arg;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
+ }
}
ty->cursor_state.cy += ty->termstate.margin_top;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
break;
case 'G': // to column N
arg = _csi_arg_get(&b);
@@ -757,8 +762,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("to column %d", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cx = arg - 1;
- if (ty->cursor_state.cx < 0) ty->cursor_state.cx = 0;
- else if (ty->cursor_state.cx >= ty->w) ty->cursor_state.cx = ty->w - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
break;
case 'd': // to row N
arg = _csi_arg_get(&b);
@@ -766,8 +770,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("to row %d", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cy = arg - 1;
- if (ty->cursor_state.cy < 0) ty->cursor_state.cy = 0;
- else if (ty->cursor_state.cy >= ty->h) ty->cursor_state.cy = ty->h - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
break;
case 'E': // down relative N rows, and to col 0
arg = _csi_arg_get(&b);
@@ -775,8 +778,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("down relative %d rows, and to col 0", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cy += arg;
- if (ty->cursor_state.cy < 0) ty->cursor_state.cy = 0;
- else if (ty->cursor_state.cy >= ty->h) ty->cursor_state.cy = ty->h - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
ty->cursor_state.cx = 0;
break;
case 'F': // up relative N rows, and to col 0
@@ -785,8 +787,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
DBG("up relative %d rows, and to col 0", arg);
ty->termstate.wrapnext = 0;
ty->cursor_state.cy -= arg;
- if (ty->cursor_state.cy < 0) ty->cursor_state.cy = 0;
- else if (ty->cursor_state.cy >= ty->h) ty->cursor_state.cy = ty->h - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
ty->cursor_state.cx = 0;
break;
case 'X': // erase N chars
@@ -1029,7 +1030,9 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
if (!arg)
{
ty->cursor_state.cx = cx;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
ty->cursor_state.cy = cy;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
}
}
break;
@@ -1569,17 +1572,20 @@ _handle_esc(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
case 'M': // move to prev line
ty->termstate.wrapnext = 0;
ty->cursor_state.cy--;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
termpty_text_scroll_rev_test(ty, EINA_TRUE);
return 1;
case 'D': // move to next line
ty->termstate.wrapnext = 0;
ty->cursor_state.cy++;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
termpty_text_scroll_test(ty, EINA_FALSE);
return 1;
case 'E': // add \n\r
ty->termstate.wrapnext = 0;
ty->cursor_state.cx = 0;
ty->cursor_state.cy++;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
termpty_text_scroll_test(ty, EINA_FALSE);
return 1;
case 'Z': // same a 'ESC [ Pn c'
diff --git a/src/bin/termptyops.c b/src/bin/termptyops.c
index e9d93f8..d35900c 100644
--- a/src/bin/termptyops.c
+++ b/src/bin/termptyops.c
@@ -7,6 +7,7 @@
#include "termptygfx.h"
#include "termptysave.h"
#include "miniview.h"
+#include <assert.h>
#undef CRITICAL
#undef ERR
@@ -151,6 +152,7 @@ termpty_text_scroll_test(Termpty *ty, Eina_Bool clear)
{
termpty_text_scroll(ty, clear);
ty->cursor_state.cy = e - 1;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
}
}
@@ -164,6 +166,7 @@ termpty_text_scroll_rev_test(Termpty *ty, Eina_Bool clear)
{
termpty_text_scroll_rev(ty, clear);
ty->cursor_state.cy = b;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
}
}
@@ -186,6 +189,7 @@ termpty_text_append(Termpty *ty, const Eina_Unicode
*codepoints, int len)
ty->termstate.wrapnext = 0;
ty->cursor_state.cx = 0;
ty->cursor_state.cy++;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cy, 0, ty->h);
termpty_text_scroll_test(ty, EINA_TRUE);
cells = &(TERMPTY_SCREEN(ty, 0, ty->cursor_state.cy));
}
@@ -220,7 +224,10 @@ termpty_text_append(Termpty *ty, const Eina_Unicode
*codepoints, int len)
if (EINA_UNLIKELY(ty->cursor_state.cx >= (ty->w - offset)))
ty->termstate.wrapnext = 1;
else
- ty->cursor_state.cx += offset;
+ {
+ ty->cursor_state.cx += offset;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
+ }
}
else
{
@@ -235,8 +242,10 @@ termpty_text_append(Termpty *ty, const Eina_Unicode
*codepoints, int len)
if (ty->cursor_state.cx > (ty->w - offset))
{
ty->cursor_state.cx = ty->w - offset;
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
return;
}
+ TERMPTY_RESTRICT_FIELD(ty->cursor_state.cx, 0, ty->w);
}
}
}
@@ -248,6 +257,8 @@ termpty_clear_line(Termpty *ty, Termpty_Clear mode, int
limit)
int n = 0;
Evas_Coord x = 0, y = ty->cursor_state.cy;
+ assert (y >= 0 && y < ty->h);
+
switch (mode)
{
case TERMPTY_CLR_END:
--
