Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / fe-text / term-terminfo.c

diff --git a/apps/irssi/src/fe-text/term-terminfo.c b/apps/irssi/src/fe-text/term-terminfo.c
index 4e9781fe744f405efd4c786d97a74029086d7a91..feeb62c30bd67e05b16fba6371f9cee002766564 100644 (file)
--- a/apps/irssi/src/fe-text/term-terminfo.c
+++ b/apps/irssi/src/fe-text/term-terminfo.c
@@ -77,7 +77,8 @@ static int redraw_timeout(void)
 
 int term_init(void)
 {
-        struct sigaction act;
+       struct sigaction act;
+        int width, height;
 
        last_fg = last_bg = -1;
        last_attrs = 0;
@@ -89,6 +90,11 @@ int term_init(void)
        if (current_term == NULL)
                return FALSE;
 
+       if (term_get_size(&width, &height)) {
+                current_term->width = width;
+                current_term->height = height;
+       }
+
         /* grab CONT signal */
        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
@@ -113,6 +119,7 @@ int term_init(void)
 void term_deinit(void)
 {
        if (current_term != NULL) {
+               signal(SIGCONT, SIG_DFL);
                g_source_remove(redraw_tag);
 
                term_common_deinit();
@@ -332,7 +339,7 @@ void term_set_color(TERM_WINDOW *window, int col)
        /* bold */
        if (col & 0x08)
                col |= ATTR_BOLD;
-       else if (col & ATTR_BOLD)
+       if (col & ATTR_BOLD)
                terminfo_set_bold();
 
        /* underline */
@@ -347,6 +354,7 @@ void term_set_color(TERM_WINDOW *window, int col)
 
 void term_move(TERM_WINDOW *window, int x, int y)
 {
+       if (x >= 0 && y >= 0) {
        vcmove = TRUE;
        vcx = x+window->x;
         vcy = y+window->y;
@@ -355,6 +363,7 @@ void term_move(TERM_WINDOW *window, int x, int y)
                vcx = term_width-1;
        if (vcy >= term_height)
                 vcy = term_height-1;
+       }
 }
 
 static void term_printed_text(int count)
@@ -365,13 +374,16 @@ static void term_printed_text(int count)
           However, next term_move() really shouldn't try to cache
           the move, otherwise terminals would try to combine the
           last word in upper line with first word in lower line. */
-        cforcemove = TRUE;
        vcx += count;
        while (vcx >= term_width) {
                vcx -= term_width;
-               if (vcy < term_height) vcy++;
+               if (vcy < term_height-1) vcy++;
                if (vcx > 0) term_lines_empty[vcy] = FALSE;
        }
+
+       crealx += count;
+       if (crealx >= term_width)
+               cforcemove = TRUE;
 }
 
 void term_addch(TERM_WINDOW *window, int chr)
@@ -380,15 +392,17 @@ void term_addch(TERM_WINDOW *window, int chr)
 
        if (vcmove) term_move_real();
 
-       /* With UTF-8, move cursor only if this char is either single-byte
-          (8. bit on) or beginning of multibyte (7+8 bits on) */
-       if (term_type != TERM_TYPE_UTF8 ||
-           (chr & 0x80) == 0 || (chr & 0x40) == 0) {
-               term_printed_text(1);
-       }
+       if (vcy < term_height-1 || vcx < term_width-1) {
+               /* With UTF-8, move cursor only if this char is either
+                  single-byte (8. bit off) or beginning of multibyte
+                  (7. bit off) */
+               if (term_type != TERM_TYPE_UTF8 ||
+                   (chr & 0x80) == 0 || (chr & 0x40) == 0) {
+                       term_printed_text(1);
+               }
 
-       if (vcy != term_height || vcx != 0)
                putc(chr, window->term->out);
+       }
 }
 
 static void term_addch_utf8(TERM_WINDOW *window, unichar chr)
@@ -406,19 +420,25 @@ void term_add_unichar(TERM_WINDOW *window, unichar chr)
        if (term_detached) return;
 
        if (vcmove) term_move_real();
-        term_printed_text(1);
-       if (vcy == term_height && vcx == 0)
+       if (vcy == term_height-1 && vcx == term_width-1)
                return; /* last char in screen */
 
        switch (term_type) {
        case TERM_TYPE_UTF8:
+               term_printed_text(utf8_width(chr));
                 term_addch_utf8(window, chr);
                break;
        case TERM_TYPE_BIG5:
-               putc((chr >> 8) & 0xff, window->term->out);
+               if (chr > 0xff) {
+                       term_printed_text(2);
+                       putc((chr >> 8) & 0xff, window->term->out);
+               } else {
+                       term_printed_text(1);
+               }
                putc((chr & 0xff), window->term->out);
                 break;
        default:
+               term_printed_text(1);
                putc(chr, window->term->out);
                 break;
        }
@@ -431,7 +451,7 @@ void term_addstr(TERM_WINDOW *window, const char *str)
        if (term_detached) return;
 
        if (vcmove) term_move_real();
-       len = strlen(str);
+       len = strlen(str); /* FIXME utf8 or big5 */
         term_printed_text(len);
 
        if (vcy != term_height || vcx != 0)
@@ -479,6 +499,7 @@ void term_refresh(TERM_WINDOW *window)
                terminfo_set_cursor_visible(TRUE);
                 curs_visible = TRUE;
        }
+
        term_set_color(window, ATTR_RESET);
        fflush(window != NULL ? window->term->out : current_term->out);
 }
@@ -486,11 +507,6 @@ void term_refresh(TERM_WINDOW *window)
 void term_refresh_freeze(void)
 {
         freeze_counter++;
-
-       if (!term_detached && curs_visible) {
-               terminfo_set_cursor_visible(FALSE);
-                curs_visible = FALSE;
-       }
 }
 
 void term_refresh_thaw(void)
@@ -529,10 +545,10 @@ void term_attach(FILE *in, FILE *out)
 void term_stop(void)
 {
        if (term_detached) {
-               kill(getpid(), SIGSTOP);
+               kill(getpid(), SIGTSTP);
        } else {
                terminfo_stop(current_term);
-               kill(getpid(), SIGSTOP);
+               kill(getpid(), SIGTSTP);
                terminfo_cont(current_term);
                irssi_redraw();
        }
@@ -542,13 +558,12 @@ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
 {
         const unsigned char *end = buffer;
 
-        *result = get_utf8_char(&end, size);
-       switch (*result) {
-       case (unichar) -2:
+       switch (get_utf8_char(&end, size, result)) {
+       case -2:
                /* not UTF8 - fallback to 8bit ascii */
                *result = *buffer;
                return 1;
-       case (unichar) -1:
+       case -1:
                 /* need more data */
                return -1;
        default:
@@ -556,12 +571,6 @@ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
        }
 }
 
-/* XXX I didn't check the encoding range of big5+. This is standard big5. */
-#define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */
-#define is_big5_lox(lo) (0x80 <= (lo) && (lo) <= 0xFE) /* extended */
-#define is_big5_hi(hi)  (0x81 <= (hi) && (hi) <= 0xFE)
-#define is_big5(hi,lo) (is_big5_hi(hi) && (is_big5_los(lo) || is_big5_lox(lo)))
-
 static int input_big5(const unsigned char *buffer, int size, unichar *result)
 {
        if (is_big5_hi(*buffer)) {
@@ -638,7 +647,7 @@ int term_gets(unichar *buffer, int size)
                if (i >= term_inbuf_pos)
                        term_inbuf_pos = 0;
                else if (i > 0) {
-                       memmove(term_inbuf+i, term_inbuf, term_inbuf_pos-i);
+                       memmove(term_inbuf, term_inbuf+i, term_inbuf_pos-i);
                         term_inbuf_pos -= i;
                }
        }