Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / fe-text / terminfo-core.h

diff --git a/apps/irssi/src/fe-text/terminfo-core.h b/apps/irssi/src/fe-text/terminfo-core.h
index 93afa78ba16a0b4601f65cabaf2497b8c45f1807..9e2b76d551d5799dd3e791f9f567b36a55a2b8c2 100644 (file)
--- a/apps/irssi/src/fe-text/terminfo-core.h
+++ b/apps/irssi/src/fe-text/terminfo-core.h
@@ -16,7 +16,7 @@
 #define terminfo_set_bold() current_term->set_bold(current_term)
 #define terminfo_set_uline(set) current_term->set_uline(current_term, set)
 #define terminfo_set_standout(set) current_term->set_standout(current_term, set)
-#define terminfo_is_colors_set(term) (term->TI_fg[0] != NULL)
+#define terminfo_is_colors_set(term) (term->TI_fg != NULL)
 #define terminfo_beep(term) current_term->beep(current_term)
 
 typedef struct _TERM_REC TERM_REC;
@@ -30,11 +30,12 @@ struct _TERM_REC {
 
         void (*clear)(TERM_REC *term);
        void (*clrtoeol)(TERM_REC *term);
-       void (*repeat)(TERM_REC *term, int chr, int count);
+       void (*repeat)(TERM_REC *term, char chr, int count);
 
        void (*set_fg)(TERM_REC *term, int color);
        void (*set_bg)(TERM_REC *term, int color);
        void (*set_normal)(TERM_REC *term);
+       void (*set_blink)(TERM_REC *term);
        void (*set_bold)(TERM_REC *term);
        void (*set_uline)(TERM_REC *term, int set);
        void (*set_standout)(TERM_REC *term, int set);
@@ -70,7 +71,7 @@ struct _TERM_REC {
        const char *TI_rep;
 
        /* Colors */
-        int has_colors;
+       int TI_colors; /* numbers of colors in TI_fg[] and TI_bg[] */
        const char *TI_sgr0; /* turn off all attributes */
        const char *TI_smul, *TI_rmul; /* underline on/off */
         const char *TI_smso, *TI_rmso; /* standout on/off */
@@ -78,7 +79,7 @@ struct _TERM_REC {
        const char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;
 
         /* Colors - generated and dynamically allocated */
-       char *TI_fg[16], *TI_bg[16], *TI_normal;
+       char **TI_fg, **TI_bg, *TI_normal;
 
        /* Beep */
         char *TI_bel;
@@ -93,9 +94,6 @@ void terminfo_core_deinit(TERM_REC *term);
    terminal capabilities don't contain color codes */
 void terminfo_setup_colors(TERM_REC *term, int force);
 
-/* Terminal was resized - ask the width/height from terminfo again */
-void terminfo_resize(TERM_REC *term);
-
 void terminfo_cont(TERM_REC *term);
 void terminfo_stop(TERM_REC *term);