summaryrefslogtreecommitdiff
path: root/src/fe-common/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-10-28 11:30:26 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-10-28 11:30:26 +0000
commit2ba339a26bc02bf4caa92e735ba79bd0dcc76a9f (patch)
treec5bdd6b1e1dfe58f3f7cc279cbdf9392578c699a /src/fe-common/core
parent8567481fd058a9f66c76a55e02305c97153b7588 (diff)
downloadirssi-2ba339a26bc02bf4caa92e735ba79bd0dcc76a9f.zip
Added support for using terminfo/termcap instead of curses. By default,
configure chooses to use ncurses if found, of terminfo if only curses was found. --with-terminfo parameter can be used to specify if you want it or not. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1924 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core')
-rw-r--r--src/fe-common/core/formats.c10
-rw-r--r--src/fe-common/core/themes.c11
-rw-r--r--src/fe-common/core/themes.h7
3 files changed, 17 insertions, 11 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index dbdd51f2..cb4a2829 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -990,8 +990,16 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
}
}
ptr++;
- if (*ptr != FORMAT_COLOR_NOCHANGE)
+ if (*ptr != FORMAT_COLOR_NOCHANGE) {
bgcolor = *ptr-'0';
+ if (bgcolor <= 7)
+ flags &= ~GUI_PRINT_FLAG_BLINK;
+ else {
+ /* blink */
+ bgcolor -= 8;
+ flags |= GUI_PRINT_FLAG_BLINK;
+ }
+ }
}
ptr++;
break;
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index c7f8cf7b..62c1ec8a 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -799,9 +799,11 @@ static int theme_read(THEME_REC *theme, const char *path, const char *data)
}
theme->default_color =
- config_get_int(config, NULL, "default_color", 0);
- theme->default_real_color =
- config_get_int(config, NULL, "default_real_color", 7);
+ config_get_int(config, NULL, "default_color", -1);
+ /* FIXME: remove after 0.7.99 */
+ if (theme->default_color == 0 &&
+ config_get_int(config, NULL, "default_real_color", -1) != -1)
+ theme->default_color = -1;
theme_read_replaces(config, theme);
if (data == NULL) {
@@ -1141,8 +1143,7 @@ static void themes_read(void)
if (current_theme == NULL) {
fname = g_strdup_printf("%s/default.theme", get_irssi_dir());
current_theme = theme_create(fname, "default");
- current_theme->default_color = 0;
- current_theme->default_real_color = 7;
+ current_theme->default_color = -1;
theme_read(current_theme, NULL, default_theme);
g_free(fname);
}
diff --git a/src/fe-common/core/themes.h b/src/fe-common/core/themes.h
index 96f23400..3693d4f4 100644
--- a/src/fe-common/core/themes.h
+++ b/src/fe-common/core/themes.h
@@ -16,11 +16,8 @@ typedef struct {
time_t last_modify;
int default_color; /* default color to use with text with default
- background. default is 0 which means the default
- color set by terminal */
- int default_real_color; /* default color to use with background set.
- this shouldn't be 0, unless black is really
- wanted. default is 7 (white). */
+ background. default is -1 which means the
+ default color set by terminal */
GHashTable *modules;
int replace_keys[256]; /* index to replace_values for each char */