X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fansi.c;h=42f6a4c650476b752907670e96b36dbfcbc55c1d;hb=76292c6be7fcbabad9ab8687eb01f3af51568a9b;hp=66c70f1125580fc90daea059e877cec5d4011137;hpb=0162da6f3043d60c28882b33f77c44afca226d46;p=sympathy.git diff --git a/src/ansi.c b/src/ansi.c index 66c70f1..42f6a4c 100644 --- a/src/ansi.c +++ b/src/ansi.c @@ -10,6 +10,21 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.33 2008/02/27 09:42:21 james + * *** empty log message *** + * + * Revision 1.32 2008/02/26 23:56:12 james + * *** empty log message *** + * + * Revision 1.31 2008/02/26 23:23:17 james + * *** empty log message *** + * + * Revision 1.30 2008/02/24 00:42:53 james + * *** empty log message *** + * + * Revision 1.29 2008/02/23 11:48:37 james + * *** empty log message *** + * * Revision 1.28 2008/02/22 17:07:00 james * *** empty log message *** * @@ -313,21 +328,66 @@ ansi_set_attr (ANSI * a, int attr) } +static void +ascii_emit (TTY * t, uint32_t ch) +{ + int i; + +/*Some quick obvious subsititons for quotation marks*/ + switch (ch) + { + case 0x2018: + ch = '`'; + break; + case 0x2019: + ch = '\''; + break; + case 0x201c: + case 0x201d: + ch = '"'; + break; + } + +/*Short cut the easy stuff*/ + if (ch < 0x7f) + { + uint8_t c = ch; + t->xmit (t, &c, 1); + return; + } + + for (i = 0; i < VT102_CHARSET_SIZE; ++i) + { + if (vt102_charset_gl[i] == ch) + { + uint8_t c[3] = { 016, i, 017 }; + t->xmit (t, &c, 3); + return; + } + } + + t->xmit (t, "?", 1); + +} static void ansi_render (ANSI * a, CRT_CA ca) { int dif; - if (ca.chr < 32) - ca.chr = ' '; - if (ca.chr > 126) + if ((ca.chr < VT102_CHARSET_SIZE) && (vt102_charset_c0[ca.chr])) + ca.chr = vt102_charset_c0[ca.chr]; + + if ((ca.chr >= 0x80) && (ca.chr < 0xa0)) ca.chr = ' '; ansi_set_attr (a, ca.attr); ansi_set_color (a, ca.color); - a->terminal->xmit (a->terminal, &ca.chr, 1); + if (a->utf8) + utf8_emit (a->terminal, ca.chr); + else + ascii_emit (a->terminal, ca.chr); a->pos.x++; @@ -445,7 +505,7 @@ ansi_draw_line (ANSI * a, CRT_CA * cap, int y) CRT_Pos p = { 0, y }; CRT_CA *acap = &a->crt.screen[CRT_ADDR_POS (&p)]; - for (p.x = 0; p.x < CRT_COLS; ++p.x) + for (p.x = 0; p.x < a->crt.size.x; ++p.x) { if (p.x >= a->size.x) continue; @@ -465,32 +525,48 @@ ansi_draw_line (ANSI * a, CRT_CA * cap, int y) } static void -ansi_resize_check (ANSI * a) +ansi_resize_check (ANSI * a, CRT_Pos *size) { - if (!crt_pos_cmp (a->terminal->size, a->size)) - return; + if ((size && crt_pos_cmp(a->crt.size,*size)) + || crt_pos_cmp (a->terminal->size, a->size)) + { - terminal_getsize (a->terminal); + terminal_getsize (a->terminal); - a->size = a->terminal->size; + a->size = a->terminal->size; - a->pos.x = ANSI_INVAL; - a->hide_cursor = ANSI_INVAL; + a->pos.x = ANSI_INVAL; + a->hide_cursor = ANSI_INVAL; - crt_reset (&a->crt); + crt_reset (&a->crt); + + if (size) + a->crt.size =*size; // FIXME: -- echos back crap? // a->terminal->xmit (a->terminal, "\033[c", 3); - ansi_cls (a); - a->terminal->xmit (a->terminal, "\033=", 2); - a->terminal->xmit (a->terminal, "\033[?6l", 5); - a->terminal->xmit (a->terminal, "\033[r", 3); +// maybe - issue 132 column command if we're 132? + + ansi_cls (a); + a->terminal->xmit (a->terminal, "\033=", 2); + a->terminal->xmit (a->terminal, "\033[?6l", 5); + a->terminal->xmit (a->terminal, "\033[r", 3); + if (a->utf8) + { + a->terminal->xmit (a->terminal, "\033%G", 3); + } + else + { + a->terminal->xmit (a->terminal, "\033(B", 3); + a->terminal->xmit (a->terminal, "\033)0", 3); + a->terminal->xmit (a->terminal, "\017", 1); + } + } } -#define HISTORY_GUESS_SCROLL 24 /*guess all 24 lines usually scroll */ /*if they haven't then ansi_draw will patch it up*/ static void @@ -498,19 +574,23 @@ ansi_history (ANSI * a, History * h) { char buf[32]; int i; + int guess_scroll; /*Do we need to catch up on history?*/ if (a->history_ptr == h->wptr) return; - ansi_resize_check (a); + ansi_resize_check (a, NULL); - if ((a->size.x < CRT_COLS) || (a->size.y < CRT_ROWS)) + if ((a->size.x < a->crt.size.x) || (a->size.y < a->crt.size.y)) return; + guess_scroll=a->crt.size.y-1; /*Bototm line should be a status line*/ + + ansi_force_attr_normal (a); ansi_set_color (a, CRT_COLOR_NORMAL); - i = sprintf (buf, "\033[%d;%dr", 1, HISTORY_GUESS_SCROLL); + i = sprintf (buf, "\033[%d;%dr", 1, guess_scroll); a->terminal->xmit (a->terminal, buf, i); @@ -528,14 +608,14 @@ ansi_history (ANSI * a, History * h) ansi_draw_line (a, e->line, 0); - /*Roll HISTORY_GUESS_SCROLL lines up putting the top line into the xterm's history */ + /*Roll guess_scroll lines up putting the top line into the xterm's history */ - /*Make extra lines a predictable colour*/ + /*Make extra lines a predictable colour */ ansi_set_color (a, CRT_COLOR_NORMAL); ansi_showhide_cursor (a, 1); - i = sprintf (buf, "\033[%d;%dH", HISTORY_GUESS_SCROLL, 1); + i = sprintf (buf, "\033[%d;%dH", guess_scroll, 1); a->terminal->xmit (a->terminal, buf, i); a->terminal->xmit (a->terminal, "\033D", 2); a->pos.x = ANSI_INVAL; @@ -549,17 +629,17 @@ ansi_history (ANSI * a, History * h) 0}; /*scroll lines up */ - for (s.y++; s.y < HISTORY_GUESS_SCROLL; s.y++, e.y++) + for (s.y++; s.y < guess_scroll; s.y++, e.y++) { memcpy (&a->crt.screen[CRT_ADDR_POS (&e)], &a->crt.screen[CRT_ADDR_POS (&s)], - sizeof (CRT_CA) * CRT_COLS); + sizeof (CRT_CA) * a->crt.size.x); } /* erase new line */ s.y = e.y; e.x = CRT_COLS - 1; - crt_erase (&a->crt, s, e, 1,CRT_COLOR_NORMAL); + crt_erase (&a->crt, s, e, 1, CRT_COLOR_NORMAL); } } @@ -579,11 +659,10 @@ ansi_draw (ANSI * a, CRT * c) int o; int hidden_cursor = 0; - ansi_resize_check (a); - + ansi_resize_check (a, &c->size); - for (p.y = 0; p.y < CRT_ROWS; ++p.y) + for (p.y = 0; p.y < a->crt.size.y; ++p.y) { if (p.y >= a->size.y) continue; @@ -593,7 +672,7 @@ ansi_draw (ANSI * a, CRT * c) } - if ((CRT_COLS > a->size.x) || (CRT_ROWS > a->size.y)) + if ((c->size.x > a->size.x) || (c->size.y > a->size.y)) { char msg[1024]; // = "Window is too small"; int i; @@ -602,7 +681,7 @@ ansi_draw (ANSI * a, CRT * c) i = sprintf (msg, "Window too small (%dx%d need %dx%d)", a->size.x, - a->size.y, CRT_COLS, CRT_ROWS); + a->size.y, c->size.x, c->size.y); ansi_showhide_cursor (a, 1); ansi_set_attr (a, CRT_ATTR_REVERSE); @@ -637,7 +716,7 @@ ansi_reset (ANSI * a, CRT * c) static void ansi_terminal_reset (ANSI * a) { - CRT_Pos p = { 0, CRT_ROWS }; + CRT_Pos p = { 0, a->crt.size.y}; ansi_force_attr_normal (a); ansi_move (a, p); @@ -880,7 +959,7 @@ ansi_free (ANSI * a) } ANSI * -ansi_new_from_terminal (TTY * t) +ansi_new_from_terminal (TTY * t, int utf8) { ANSI *ret; @@ -889,6 +968,7 @@ ansi_new_from_terminal (TTY * t) ret->terminal = t; + ret->utf8 = utf8; ret->update = ansi_update; ret->reset = ansi_reset; ret->terminal_reset = ansi_terminal_reset;