splut up termpty a lot. still escape handling is the largest bit -

1200 lines or so, but not a lot that canbe done about that as its the
smallest really logical unit there.



SVN revision: 73798
devs/lucas/wip
Carsten Haitzler 11 years ago
parent 92d58dc532
commit 197e0bbf46
  1. 4
      src/bin/Makefile.am
  2. 1612
      src/bin/termpty.c
  3. 2
      src/bin/termpty.h
  4. 1224
      src/bin/termptyesc.c
  5. 2
      src/bin/termptyesc.h
  6. 61
      src/bin/termptyext.c
  7. 2
      src/bin/termptyext.h
  8. 53
      src/bin/termptygfx.c
  9. 2
      src/bin/termptygfx.h
  10. 354
      src/bin/termptyops.c
  11. 21
      src/bin/termptyops.h

@ -27,6 +27,10 @@ options_wallpaper.c options_wallpaper.h \
termio.c termio.h \
termpty.c termpty.h \
termptydbl.c termptydbl.h \
termptyesc.c termptyesc.h \
termptyops.c termptyops.h \
termptygfx.c termptygfx.h \
termptyext.c termptyext.h \
utf8.c utf8.h \
win.c win.h \
utils.c utils.h

File diff suppressed because it is too large Load Diff

@ -132,3 +132,5 @@ Termcell *termpty_cellrow_get(Termpty *ty, int y, int *wret);
void termpty_write(Termpty *ty, const char *input, int len);
void termpty_resize(Termpty *ty, int w, int h);
void termpty_backscroll_set(Termpty *ty, int size);
extern int _termpty_log_dom;

File diff suppressed because it is too large Load Diff

@ -0,0 +1,2 @@
int _termpty_handle_seq(Termpty *ty, Eina_Unicode *c, Eina_Unicode *ce);

@ -0,0 +1,61 @@
#include "private.h"
#include <Elementary.h>
#include "termpty.h"
#include "termptyops.h"
#undef CRITICAL
#undef ERR
#undef WRN
#undef INF
#undef DBG
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_termpty_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_termpty_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_termpty_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_termpty_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_termpty_log_dom, __VA_ARGS__)
//// extended terminology escape handling goes in here
//
// this is where escapes get handled *IF* the termpty layer needs to interpret
// them itself for some reason. if it returns EINA_FALSE, it means the escape
// is to be passed onto termio layer as a callback and handled there after
// this code. an extended escape may be handled in here exclusively (return
// EINA_TRUE), handled here first, then in termio (EINA_FALSE return) or not
// handled here at all and just passed to termio to figure it out (return
// EINA_FALSE).
//
// command strings like like this:
// axBLAHBLAH
// where 'a' is the major opcode char.
// and 'x' is the minor opcode char.
// and 'BLAHBLAH' is an optional data payload string
static Eina_Bool
_handle_op_a(Termpty *ty __UNUSED__, const char *txt, Eina_Unicode *utxt __UNUSED__)
{
switch (txt[1])
{
case 'a': // command aa*
break;
// room here for more minor opcode chars like 'b', 'c' etc.
default:
break;
}
return EINA_FALSE;
}
Eina_Bool
_termpty_ext_handle(Termpty *ty, const char *txt, Eina_Unicode *utxt)
{
switch (txt[0]) // major opcode
{
case 'a': // command a*
return _handle_op_a(ty, txt, utxt);
break;
// room here for more major opcode chars like 'b', 'c' etc.
default:
break;
}
return EINA_FALSE;
}

@ -0,0 +1,2 @@
Eina_Bool _termpty_ext_handle(Termpty *ty, const char *txt, Eina_Unicode *utxt);

@ -0,0 +1,53 @@
#include "private.h"
#include <Elementary.h>
#include "termptygfx.h"
/* translates VT100 ACS escape codes to Unicode values.
* Based on rxvt-unicode screen.C table.
*/
static const unsigned short vt100_to_unicode[62] =
{
// ? ? ? ? ? ? ?
// A=UPARR B=DNARR C=RTARR D=LFARR E=FLBLK F=3/4BL G=SNOMN
0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603,
// H= I= J= K= L= M= N=
0, 0, 0, 0, 0, 0, 0,
// O= P= Q= R= S= T= U=
0, 0, 0, 0, 0, 0, 0,
// V= W= X= Y= Z= [= \=
0, 0, 0, 0, 0, 0, 0,
// ? ? v->0 v->1 v->2 v->3 v->4
// ]= ^= _=SPC `=DIAMN a=HSMED b=HT c=FF
0, 0, 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c,
// v->5 v->6 v->7 v->8 v->9 v->a v->b
// d=CR e=LF f=DEGRE g=PLSMN h=NL i=VT j=SL-BR
0x240d, 0x240a, 0x00b0, 0x00b1, 0x2424, 0x240b, 0x2518,
// v->c v->d v->e v->f v->10 v->11 v->12
// k=SL-TR l=SL-TL m=SL-BL n=SL-+ o=SL-T1 p=SL-T2 q=SL-HZ
0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, 0x23bb, 0x2500,
// v->13 v->14 v->15 v->16 v->17 v->18 v->19
// r=SL-T4 s=SL-T5 t=SL-VR u=SL-VL v=SL-HU w=Sl-HD x=SL-VT
0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, 0x2502,
// v->1a v->1b b->1c v->1d v->1e/a3 v->1f
// y=LT-EQ z=GT-EQ {=PI |=NOTEQ }=POUND ~=DOT
0x2264, 0x2265, 0x03c0, 0x2260, 0x20a4, 0x00b7
};
Eina_Unicode
_termpty_charset_trans(Eina_Unicode g, int chset)
{
switch (chset)
{
case '0': /* DEC Special Character & Line Drawing Set */
if ((g >= 0x41) && (g <= 0x7e) &&
(vt100_to_unicode[g - 0x41]))
return vt100_to_unicode[g - 0x41];
break;
case 'A': /* UK, replaces # with GBP */
if (g == '#') return 0x20a4;
break;
default:
break;
}
return g;
}

@ -0,0 +1,2 @@
Eina_Unicode _termpty_charset_trans(Eina_Unicode g, int chset);

@ -0,0 +1,354 @@
#include "private.h"
#include <Elementary.h>
#include "termpty.h"
#include "termptydbl.h"
#include "termptyops.h"
#include "termptygfx.h"
#undef CRITICAL
#undef ERR
#undef WRN
#undef INF
#undef DBG
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_termpty_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_termpty_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_termpty_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_termpty_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_termpty_log_dom, __VA_ARGS__)
static void
_text_clear(Termpty *ty, Termcell *cells, int count, int val, Eina_Bool inherit_att)
{
int i;
Termatt clear;
memset(&clear, 0, sizeof(clear));
if (inherit_att)
{
for (i = 0; i < count; i++)
{
cells[i].codepoint = val;
cells[i].att = ty->state.att;
}
}
else
{
for (i = 0; i < count; i++)
{
cells[i].codepoint = val;
cells[i].att = clear;
}
}
}
static void
_text_save_top(Termpty *ty)
{
Termsave *ts;
if (ty->backmax <= 0) return;
ts = malloc(sizeof(Termsave) + ((ty->w - 1) * sizeof(Termcell)));
ts->w = ty->w;
_termpty_text_copy(ty, ty->screen, ts->cell, ty->w);
if (!ty->back) ty->back = calloc(1, sizeof(Termsave *) * ty->backmax);
if (ty->back[ty->backpos]) free(ty->back[ty->backpos]);
ty->back[ty->backpos] = ts;
ty->backpos++;
if (ty->backpos >= ty->backmax) ty->backpos = 0;
ty->backscroll_num++;
if (ty->backscroll_num >= ty->backmax) ty->backscroll_num = ty->backmax - 1;
}
void
_termpty_text_copy(Termpty *ty __UNUSED__, Termcell *cells, Termcell *dest, int count)
{
memcpy(dest, cells, sizeof(*(cells)) * count);
}
void
_termpty_text_scroll(Termpty *ty)
{
Termcell *cells = NULL, *cells2;
int y, start_y = 0, end_y = ty->h - 1;
if (ty->state.scroll_y2 != 0)
{
start_y = ty->state.scroll_y1;
end_y = ty->state.scroll_y2 - 1;
}
else
{
if (!ty->altbuf)
{
_text_save_top(ty);
if (ty->cb.scroll.func) ty->cb.scroll.func(ty->cb.scroll.data);
}
else
if (ty->cb.cancel_sel.func)
ty->cb.cancel_sel.func(ty->cb.cancel_sel.data);
}
DBG("... scroll!!!!! [%i->%i]", start_y, end_y);
cells2 = &(ty->screen[end_y * ty->w]);
for (y = start_y; y < end_y; y++)
{
cells = &(ty->screen[y * ty->w]);
cells2 = &(ty->screen[(y + 1) * ty->w]);
_termpty_text_copy(ty, cells2, cells, ty->w);
}
_text_clear(ty, cells2, ty->w, ' ', EINA_TRUE);
}
void
_termpty_text_scroll_rev(Termpty *ty)
{
Termcell *cells, *cells2 = NULL;
int y, start_y = 0, end_y = ty->h - 1;
if (ty->state.scroll_y2 != 0)
{
start_y = ty->state.scroll_y1;
end_y = ty->state.scroll_y2 - 1;
}
DBG("... scroll rev!!!!! [%i->%i]", start_y, end_y);
cells = &(ty->screen[end_y * ty->w]);
for (y = end_y; y > start_y; y--)
{
cells = &(ty->screen[(y - 1) * ty->w]);
cells2 = &(ty->screen[y * ty->w]);
_termpty_text_copy(ty, cells, cells2, ty->w);
}
_text_clear(ty, cells, ty->w, ' ', EINA_TRUE);
}
void
_termpty_text_scroll_test(Termpty *ty)
{
int e = ty->h;
if (ty->state.scroll_y2 != 0) e = ty->state.scroll_y2;
if (ty->state.cy >= e)
{
_termpty_text_scroll(ty);
ty->state.cy = e - 1;
}
}
void
_termpty_text_scroll_rev_test(Termpty *ty)
{
int b = 0;
if (ty->state.scroll_y2 != 0) b = ty->state.scroll_y1;
if (ty->state.cy < b)
{
_termpty_text_scroll_rev(ty);
ty->state.cy = b;
}
}
void
_termpty_text_append(Termpty *ty, const Eina_Unicode *codepoints, int len)
{
Termcell *cells;
int i, j;
cells = &(ty->screen[ty->state.cy * ty->w]);
for (i = 0; i < len; i++)
{
Eina_Unicode g;
if (ty->state.wrapnext)
{
cells[ty->state.cx].att.autowrapped = 1;
ty->state.wrapnext = 0;
ty->state.cx = 0;
ty->state.cy++;
_termpty_text_scroll_test(ty);
cells = &(ty->screen[ty->state.cy * ty->w]);
}
if (ty->state.insert)
{
for (j = ty->w - 1; j > ty->state.cx; j--)
cells[j] = cells[j - 1];
}
g = _termpty_charset_trans(codepoints[i], ty->state.charsetch);
cells[ty->state.cx].codepoint = g;
cells[ty->state.cx].att = ty->state.att;
#if defined(SUPPORT_DBLWIDTH)
cells[ty->state.cx].att.dblwidth = _termpty_is_dblwidth_get(ty, g);
if ((cells[ty->state.cx].att.dblwidth) && (ty->state.cx < (ty->w - 1)))
{
cells[ty->state.cx + 1].codepoint = 0;
cells[ty->state.cx + 1].att = cells[ty->state.cx].att;
}
#endif
if (ty->state.wrap)
{
ty->state.wrapnext = 0;
#if defined(SUPPORT_DBLWIDTH)
if (cells[ty->state.cx].att.dblwidth)
{
if (ty->state.cx >= (ty->w - 2)) ty->state.wrapnext = 1;
else ty->state.cx += 2;
}
else
{
if (ty->state.cx >= (ty->w - 1)) ty->state.wrapnext = 1;
else ty->state.cx++;
}
#else
if (ty->state.cx >= (ty->w - 1)) ty->state.wrapnext = 1;
else ty->state.cx++;
#endif
}
else
{
ty->state.wrapnext = 0;
ty->state.cx++;
#if defined(SUPPORT_DBLWIDTH)
if (cells[ty->state.cx].att.dblwidth)
{
ty->state.cx++;
if (ty->state.cx >= (ty->w - 1))
ty->state.cx = ty->w - 2;
}
else
{
if (ty->state.cx >= ty->w)
ty->state.cx = ty->w - 1;
}
#else
if (ty->state.cx >= ty->w)
ty->state.cx = ty->w - 1;
#endif
}
}
}
void
_termpty_clear_line(Termpty *ty, Termpty_Clear mode, int limit)
{
Termcell *cells;
int n = 0;
cells = &(ty->screen[ty->state.cy * ty->w]);
switch (mode)
{
case TERMPTY_CLR_END:
n = ty->w - ty->state.cx;
cells = &(cells[ty->state.cx]);
break;
case TERMPTY_CLR_BEGIN:
n = ty->state.cx + 1;
break;
case TERMPTY_CLR_ALL:
n = ty->w;
break;
default:
return;
}
if (n > limit) n = limit;
_text_clear(ty, cells, n, 0, EINA_TRUE);
}
void
_termpty_clear_screen(Termpty *ty, Termpty_Clear mode)
{
Termcell *cells;
cells = ty->screen;
switch (mode)
{
case TERMPTY_CLR_END:
_termpty_clear_line(ty, mode, ty->w);
if (ty->state.cy < (ty->h - 1))
{
cells = &(ty->screen[(ty->state.cy + 1) * ty->w]);
_text_clear(ty, cells, ty->w * (ty->h - ty->state.cy - 1), 0, EINA_TRUE);
}
break;
case TERMPTY_CLR_BEGIN:
if (ty->state.cy > 0)
_text_clear(ty, cells, ty->w * ty->state.cy, 0, EINA_TRUE);
_termpty_clear_line(ty, mode, ty->w);
break;
case TERMPTY_CLR_ALL:
_text_clear(ty, cells, ty->w * ty->h, 0, EINA_TRUE);
break;
default:
break;
}
if (ty->cb.cancel_sel.func)
ty->cb.cancel_sel.func(ty->cb.cancel_sel.data);
}
void
_termpty_clear_all(Termpty *ty)
{
if (!ty->screen) return;
memset(ty->screen, 0, sizeof(*(ty->screen)) * ty->w * ty->h);
}
void
_termpty_reset_att(Termatt *att)
{
att->fg = COL_DEF;
att->bg = COL_DEF;
att->bold = 0;
att->faint = 0;
#if defined(SUPPORT_ITALIC)
att->italic = 0;
#elif defined(SUPPORT_DBLWIDTH)
att->dblwidth = 0;
#endif
att->underline = 0;
att->blink = 0;
att->blink2 = 0;
att->inverse = 0;
att->invisible = 0;
att->strike = 0;
att->fg256 = 0;
att->bg256 = 0;
att->fgintense = 0;
att->bgintense = 0;
att->autowrapped = 0;
att->newline = 0;
att->tab = 0;
}
void
_termpty_reset_state(Termpty *ty)
{
ty->state.cx = 0;
ty->state.cy = 0;
ty->state.scroll_y1 = 0;
ty->state.scroll_y2 = 0;
ty->state.had_cr_x = 0;
ty->state.had_cr_y = 0;
_termpty_reset_att(&(ty->state.att));
ty->state.charset = 0;
ty->state.charsetch = 'B';
ty->state.chset[0] = 'B';
ty->state.chset[1] = 'B';
ty->state.chset[2] = 'B';
ty->state.chset[3] = 'B';
ty->state.multibyte = 0;
ty->state.alt_kp = 0;
ty->state.insert = 0;
ty->state.appcursor = 0;
ty->state.wrap = 1;
ty->state.wrapnext = 0;
ty->state.hidecursor = 0;
ty->state.crlf = 0;
ty->state.had_cr = 0;
}
void
_termpty_cursor_copy(Termstate *state, Termstate *dest)
{
dest->cx = state->cx;
dest->cy = state->cy;
}

@ -0,0 +1,21 @@
typedef enum _Termpty_Clear
{
TERMPTY_CLR_END,
TERMPTY_CLR_BEGIN,
TERMPTY_CLR_ALL
} Termpty_Clear;
void _termpty_text_copy(Termpty *ty, Termcell *cells, Termcell *dest, int count);
void _termpty_text_scroll(Termpty *ty);
void _termpty_text_scroll_rev(Termpty *ty);
void _termpty_text_scroll_test(Termpty *ty);
void _termpty_text_scroll_rev_test(Termpty *ty);
void _termpty_text_append(Termpty *ty, const Eina_Unicode *codepoints, int len);
void _termpty_clear_line(Termpty *ty, Termpty_Clear mode, int limit);
void _termpty_clear_screen(Termpty *ty, Termpty_Clear mode);
void _termpty_clear_all(Termpty *ty);
void _termpty_reset_att(Termatt *att);
void _termpty_reset_state(Termpty *ty);
void _termpty_cursor_copy(Termstate *state, Termstate *dest);
#define _term_txt_write(ty, txt) termpty_write(ty, txt, sizeof(txt) - 1)
Loading…
Cancel
Save