Merge Irssi 0.8.16-rc1

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

diff --git a/apps/irssi/src/fe-text/term.h b/apps/irssi/src/fe-text/term.h
index b5103c14be925208f7a6f179ff856b218f5cee78..27174c83ee8a08ffc216bedb14909f3f606423e2 100644 (file)
--- a/apps/irssi/src/fe-text/term.h
+++ b/apps/irssi/src/fe-text/term.h
@@ -13,7 +13,7 @@ typedef struct _TERM_WINDOW TERM_WINDOW;
 
 #define ATTR_RESET     (ATTR_RESETFG|ATTR_RESETBG)
 
-#define ATTR_NOCOLORS (ATTR_UNDERLINE|ATTR_REVERSE)
+#define ATTR_NOCOLORS (ATTR_UNDERLINE|ATTR_REVERSE|ATTR_BLINK|ATTR_BOLD)
 
 /* terminal types */
 #define TERM_TYPE_8BIT         0 /* normal 8bit text */
@@ -24,7 +24,7 @@ typedef guint32 unichar;
 
 extern TERM_WINDOW *root_window;
 extern int term_width, term_height;
-extern int term_use_colors, term_type, term_detached;
+extern int term_use_colors, term_type;
 
 /* Initialize / deinitialize terminal */
 int term_init(void);
@@ -66,7 +66,7 @@ void term_window_scroll(TERM_WINDOW *window, int count);
 void term_set_color(TERM_WINDOW *window, int col);
 
 void term_move(TERM_WINDOW *window, int x, int y);
-void term_addch(TERM_WINDOW *window, int chr);
+void term_addch(TERM_WINDOW *window, char chr);
 void term_add_unichar(TERM_WINDOW *window, unichar chr);
 void term_addstr(TERM_WINDOW *window, const char *str);
 void term_clrtoeol(TERM_WINDOW *window);
@@ -77,16 +77,11 @@ void term_refresh_freeze(void);
 void term_refresh_thaw(void);
 void term_refresh(TERM_WINDOW *window);
 
-/* Automatically detach irssi when terminal is lost */
-void term_auto_detach(int set);
-void term_detach(void);
-void term_attach(FILE *in, FILE *out);
-
 void term_stop(void);
 
 /* keyboard input handling */
 void term_set_input_type(int type);
-int term_gets(unichar *buffer, int size);
+void term_gets(GArray *buffer, int *line_count);
 
 /* internal */
 void term_common_init(void);