zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 20:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Hilighting updates. /HILIGHT -color, /SET hilight_color and /SET

Browse source 
hilight_act_color now use %codes for specifying color.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1402 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-03-17 01:52:43 +00:00 • committed by cras
commit c3da7fa8ab
13 changed files with 97 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/fe-common/core/formats.c
View file

@ -31,6 +31,10 @@
#include "themes.h"
#include "translation.h"
static const char *format_backs = "04261537";
static const char *format_fores = "kbgcrmyw";
static const char *format_boldfores = "KBGCRMYW";
static int signal_gui_print_text;
static int hide_text_style;
@ -57,9 +61,6 @@ int format_find_tag(const char *module, const char *tag)
int format_expand_styles(GString *out, char format)
{
static const char *backs = "04261537";
static const char *fores = "kbgcrmyw";
static const char *boldfores = "KBGCRMYW";
char *p;
switch (format) {
@ -102,30 +103,30 @@ int format_expand_styles(GString *out, char format)
break;
default:
/* check if it's a background color */
p = strchr(backs, format);
p = strchr(format_backs, format);
if (p != NULL) {
g_string_append_c(out, 4);
g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
g_string_append_c(out, (char) ((int) (p-backs)+'0'));
g_string_append_c(out, (char) ((int) (p-format_backs)+'0'));
break;
}
/* check if it's a foreground color */
if (format == 'p') format = 'm';
p = strchr(fores, format);
p = strchr(format_fores, format);
if (p != NULL) {
g_string_append_c(out, 4);
g_string_append_c(out, (char) ((int) (p-fores)+'0'));
g_string_append_c(out, (char) ((int) (p-format_fores)+'0'));
g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
break;
}
/* check if it's a bold foreground color */
if (format == 'P') format = 'M';
p = strchr(boldfores, format);
p = strchr(format_boldfores, format);
if (p != NULL) {
g_string_append_c(out, 4);
g_string_append_c(out, (char) (8+(int) (p-boldfores)+'0'));
g_string_append_c(out, (char) (8+(int) (p-format_boldfores)+'0'));
g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
break;
}
@ -212,8 +213,7 @@ void format_create_dest(TEXT_DEST_REC *dest,
window_find_closest(server, target, level);
dest->hilight_priority = 0;
dest->hilight_color = 0;
dest->hilight_bg_color = 0;
dest->hilight_color = NULL;
}
/* Return length of text part in string (ie. without % codes) */
@ -283,6 +283,40 @@ int format_real_length(const char *str, int len)
return (int) (str-start);
}
char *format_string_expand(const char *text)
{
GString *out;
char code, *ret;
g_return_val_if_fail(text != NULL, NULL);
out = g_string_new(NULL);
code = 0;
while (*text != '\0') {
if (code == '%') {
/* color code */
if (!format_expand_styles(out, *text)) {
g_string_append_c(out, '%');
g_string_append_c(out, '%');
g_string_append_c(out, *text);
}
code = 0;
} else {
if (*text == '%')
code = *text;
else
g_string_append_c(out, *text);
}
text++;
}
ret = out->str;
g_string_free(out, FALSE);
return ret;
}
static char *format_get_text_args(TEXT_DEST_REC *dest,
const char *text, char **arglist)
{