mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 12:23:37 +02:00
Text printing changes. Formats are now optionally saved to each line so
later if you used /format it would change the old lines too. However the actual line changing doesn't work yet :) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@836 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen
cras
parent
61f33a6bb2
commit
d1330fff6d
14 changed files with 515 additions and 391 deletions
|
|
@ -22,12 +22,17 @@
|
|||
#include "module-formats.h"
|
||||
#include "signals.h"
|
||||
#include "special-vars.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include "levels.h"
|
||||
|
||||
#include "windows.h"
|
||||
#include "formats.h"
|
||||
#include "themes.h"
|
||||
#include "translation.h"
|
||||
|
||||
static int signal_gui_print_text;
|
||||
static int hide_text_style;
|
||||
|
||||
int format_expand_styles(GString *out, char format, TEXT_DEST_REC *dest)
|
||||
{
|
||||
|
|
@ -112,7 +117,7 @@ int format_expand_styles(GString *out, char format, TEXT_DEST_REC *dest)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void read_arglist(va_list va, FORMAT_REC *format,
|
||||
void format_read_arglist(va_list va, FORMAT_REC *format,
|
||||
char **arglist, int arglist_size,
|
||||
char *buffer, int buffer_size)
|
||||
{
|
||||
|
|
@ -186,22 +191,13 @@ void format_create_dest(TEXT_DEST_REC *dest,
|
|||
window_find_closest(server, target, level);
|
||||
}
|
||||
|
||||
static char *format_get_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
|
||||
const char *text, va_list va)
|
||||
static char *format_get_text_args(TEXT_DEST_REC *dest,
|
||||
const char *text, char **arglist)
|
||||
{
|
||||
GString *out;
|
||||
char *arglist[10];
|
||||
char buffer[200]; /* should be enough? (won't overflow even if it isn't) */
|
||||
|
||||
char code, *ret;
|
||||
int need_free;
|
||||
|
||||
/* read all optional arguments to arglist[] list
|
||||
so they can be used in any order.. */
|
||||
read_arglist(va, format,
|
||||
arglist, sizeof(arglist)/sizeof(void*),
|
||||
buffer, sizeof(buffer));
|
||||
|
||||
out = g_string_new(NULL);
|
||||
|
||||
code = 0;
|
||||
|
|
@ -271,17 +267,33 @@ char *format_get_text_theme(THEME_REC *theme, const char *module,
|
|||
char *format_get_text_theme_args(THEME_REC *theme, const char *module,
|
||||
TEXT_DEST_REC *dest, int formatnum,
|
||||
va_list va)
|
||||
{
|
||||
char *arglist[MAX_FORMAT_PARAMS];
|
||||
char buffer[DEFAULT_FORMAT_ARGLIST_SIZE];
|
||||
FORMAT_REC *formats;
|
||||
|
||||
formats = g_hash_table_lookup(default_formats, module);
|
||||
format_read_arglist(va, &formats[formatnum],
|
||||
arglist, sizeof(arglist)/sizeof(char *),
|
||||
buffer, sizeof(buffer));
|
||||
|
||||
return format_get_text_theme_charargs(theme, module, dest,
|
||||
formatnum, arglist);
|
||||
}
|
||||
|
||||
char *format_get_text_theme_charargs(THEME_REC *theme, const char *module,
|
||||
TEXT_DEST_REC *dest, int formatnum,
|
||||
char **args)
|
||||
{
|
||||
MODULE_THEME_REC *module_theme;
|
||||
FORMAT_REC *formats;
|
||||
char *str;
|
||||
char *text;
|
||||
|
||||
module_theme = g_hash_table_lookup(theme->modules, module);
|
||||
formats = g_hash_table_lookup(default_formats, module);
|
||||
|
||||
str = format_get_text_args(dest, &formats[formatnum],
|
||||
module_theme->expanded_formats[formatnum], va);
|
||||
return str;
|
||||
text = module_theme->expanded_formats[formatnum];
|
||||
return format_get_text_args(dest, text, args);
|
||||
}
|
||||
|
||||
char *format_get_text(const char *module, WINDOW_REC *window,
|
||||
|
|
@ -352,3 +364,318 @@ char *format_get_line_start(THEME_REC *theme, TEXT_DEST_REC *dest)
|
|||
|
||||
return format_get_text_theme(theme, MODULE_NAME, dest, format);
|
||||
}
|
||||
|
||||
void format_newline(WINDOW_REC *window)
|
||||
{
|
||||
window->lines++;
|
||||
if (window->lines != 1) {
|
||||
signal_emit_id(signal_gui_print_text, 6, window,
|
||||
GINT_TO_POINTER(-1), GINT_TO_POINTER(-1),
|
||||
GINT_TO_POINTER(PRINTFLAG_NEWLINE),
|
||||
"", GINT_TO_POINTER(-1));
|
||||
}
|
||||
}
|
||||
|
||||
/* parse ANSI color string */
|
||||
static char *get_ansi_color(THEME_REC *theme, char *str,
|
||||
int *fg_ret, int *bg_ret, int *flags_ret)
|
||||
{
|
||||
static char ansitab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
|
||||
char *start;
|
||||
int fg, bg, flags, num;
|
||||
|
||||
if (*str != '[')
|
||||
return str;
|
||||
start = str++;
|
||||
|
||||
fg = fg_ret == NULL || *fg_ret < 0 ? theme->default_color : *fg_ret;
|
||||
bg = bg_ret == NULL || *bg_ret < 0 ? -1 : *bg_ret;
|
||||
flags = flags_ret == NULL ? 0 : *flags_ret;
|
||||
|
||||
num = 0;
|
||||
for (;; str++) {
|
||||
if (*str == '\0') return start;
|
||||
|
||||
if (isdigit((int) *str)) {
|
||||
num = num*10 + (*str-'0');
|
||||
continue;
|
||||
}
|
||||
|
||||
if (*str != ';' && *str != 'm')
|
||||
return start;
|
||||
|
||||
switch (num) {
|
||||
case 0:
|
||||
/* reset colors back to default */
|
||||
fg = theme->default_color;
|
||||
bg = -1;
|
||||
flags &= ~(PRINTFLAG_BEEP|PRINTFLAG_INDENT);
|
||||
break;
|
||||
case 1:
|
||||
/* hilight */
|
||||
flags |= PRINTFLAG_BOLD;
|
||||
break;
|
||||
case 5:
|
||||
/* blink */
|
||||
flags |= PRINTFLAG_BLINK;
|
||||
break;
|
||||
case 7:
|
||||
/* reverse */
|
||||
flags |= PRINTFLAG_REVERSE;
|
||||
break;
|
||||
default:
|
||||
if (num >= 30 && num <= 37)
|
||||
fg = (fg & 0xf8) + ansitab[num-30];
|
||||
if (num >= 40 && num <= 47) {
|
||||
if (bg == -1) bg = 0;
|
||||
bg = (bg & 0xf8) + ansitab[num-40];
|
||||
}
|
||||
break;
|
||||
}
|
||||
num = 0;
|
||||
|
||||
if (*str == 'm') {
|
||||
if (fg_ret != NULL) *fg_ret = fg;
|
||||
if (bg_ret != NULL) *bg_ret = bg;
|
||||
if (flags_ret != NULL) *flags_ret = flags;
|
||||
|
||||
str++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* parse MIRC color string */
|
||||
static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
|
||||
{
|
||||
int fg, bg;
|
||||
|
||||
fg = fg_ret == NULL ? -1 : *fg_ret;
|
||||
bg = bg_ret == NULL ? -1 : *bg_ret;
|
||||
|
||||
if (!isdigit((int) **str) && **str != ',') {
|
||||
fg = -1;
|
||||
bg = -1;
|
||||
} else {
|
||||
/* foreground color */
|
||||
if (**str != ',') {
|
||||
fg = **str-'0';
|
||||
(*str)++;
|
||||
if (isdigit((int) **str)) {
|
||||
fg = fg*10 + (**str-'0');
|
||||
(*str)++;
|
||||
}
|
||||
}
|
||||
if (**str == ',') {
|
||||
/* background color */
|
||||
(*str)++;
|
||||
if (!isdigit((int) **str))
|
||||
bg = -1;
|
||||
else {
|
||||
bg = **str-'0';
|
||||
(*str)++;
|
||||
if (isdigit((int) **str)) {
|
||||
bg = bg*10 + (**str-'0');
|
||||
(*str)++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (fg_ret) *fg_ret = fg;
|
||||
if (bg_ret) *bg_ret = bg;
|
||||
}
|
||||
|
||||
#define IS_COLOR_CODE(c) \
|
||||
((c) == 2 || (c) == 3 || (c) == 4 || (c) == 6 || (c) == 7 || \
|
||||
(c) == 15 || (c) == 22 || (c) == 27 || (c) == 31)
|
||||
|
||||
char *strip_codes(const char *input)
|
||||
{
|
||||
const char *p;
|
||||
char *str, *out;
|
||||
|
||||
out = str = g_strdup(input);
|
||||
for (p = input; *p != '\0'; p++) {
|
||||
if (*p == 3) {
|
||||
p++;
|
||||
|
||||
/* mirc color */
|
||||
get_mirc_color(&p, NULL, NULL);
|
||||
p--;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (*p == 4 && p[1] != '\0') {
|
||||
if (p[1] >= FORMAT_STYLE_SPECIAL) {
|
||||
p++;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* irssi color */
|
||||
if (p[2] != '\0') {
|
||||
p += 2;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (!IS_COLOR_CODE(*p))
|
||||
*out++ = *p;
|
||||
}
|
||||
|
||||
*out = '\0';
|
||||
return str;
|
||||
}
|
||||
|
||||
/* send a fully parsed text string for GUI to print */
|
||||
void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
|
||||
{
|
||||
char *dup, *str, *ptr, type;
|
||||
int fgcolor, bgcolor;
|
||||
int flags;
|
||||
|
||||
dup = str = g_strdup(text);
|
||||
|
||||
flags = 0; fgcolor = -1; bgcolor = -1;
|
||||
while (*str != '\0') {
|
||||
type = '\0';
|
||||
for (ptr = str; *ptr != '\0'; ptr++) {
|
||||
if (IS_COLOR_CODE(*ptr) || *ptr == '\n') {
|
||||
type = *ptr;
|
||||
*ptr++ = '\0';
|
||||
break;
|
||||
}
|
||||
|
||||
*ptr = (char) translation_in[(int) (unsigned char) *ptr];
|
||||
}
|
||||
|
||||
if (type == 7) {
|
||||
/* bell */
|
||||
if (settings_get_bool("bell_beeps"))
|
||||
flags |= PRINTFLAG_BEEP;
|
||||
}
|
||||
|
||||
if (*str != '\0' || (flags & PRINTFLAG_BEEP)) {
|
||||
/* send the text to gui handler */
|
||||
signal_emit_id(signal_gui_print_text, 6, dest->window,
|
||||
GINT_TO_POINTER(fgcolor),
|
||||
GINT_TO_POINTER(bgcolor),
|
||||
GINT_TO_POINTER(flags), str,
|
||||
dest->level);
|
||||
flags &= ~(PRINTFLAG_BEEP | PRINTFLAG_INDENT);
|
||||
}
|
||||
|
||||
if (type == '\n')
|
||||
format_newline(dest->window);
|
||||
|
||||
if (*ptr == '\0')
|
||||
break;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case 2:
|
||||
/* bold */
|
||||
if (!hide_text_style)
|
||||
flags ^= PRINTFLAG_BOLD;
|
||||
break;
|
||||
case 3:
|
||||
/* MIRC color */
|
||||
get_mirc_color((const char **) &ptr,
|
||||
hide_text_style ? NULL : &fgcolor,
|
||||
hide_text_style ? NULL : &bgcolor);
|
||||
if (!hide_text_style)
|
||||
flags |= PRINTFLAG_MIRC_COLOR;
|
||||
break;
|
||||
case 4:
|
||||
/* user specific colors */
|
||||
flags &= ~PRINTFLAG_MIRC_COLOR;
|
||||
switch (*ptr) {
|
||||
case FORMAT_STYLE_UNDERLINE:
|
||||
flags ^= PRINTFLAG_UNDERLINE;
|
||||
break;
|
||||
case FORMAT_STYLE_BOLD:
|
||||
flags ^= PRINTFLAG_BOLD;
|
||||
break;
|
||||
case FORMAT_STYLE_REVERSE:
|
||||
flags ^= PRINTFLAG_REVERSE;
|
||||
break;
|
||||
case FORMAT_STYLE_INDENT:
|
||||
flags |= PRINTFLAG_INDENT;
|
||||
break;
|
||||
case FORMAT_STYLE_DEFAULTS:
|
||||
fgcolor = bgcolor = -1;
|
||||
flags &= PRINTFLAG_INDENT;
|
||||
break;
|
||||
default:
|
||||
if (*ptr != FORMAT_COLOR_NOCHANGE) {
|
||||
fgcolor = (unsigned char) *ptr-'0';
|
||||
if (fgcolor <= 7)
|
||||
flags &= ~PRINTFLAG_BOLD;
|
||||
else {
|
||||
/* bold */
|
||||
if (fgcolor != 8) fgcolor -= 8;
|
||||
flags |= PRINTFLAG_BOLD;
|
||||
}
|
||||
}
|
||||
ptr++;
|
||||
if (*ptr != FORMAT_COLOR_NOCHANGE)
|
||||
bgcolor = *ptr-'0';
|
||||
}
|
||||
ptr++;
|
||||
break;
|
||||
case 6:
|
||||
/* blink */
|
||||
if (!hide_text_style)
|
||||
flags ^= PRINTFLAG_BLINK;
|
||||
break;
|
||||
case 15:
|
||||
/* remove all styling */
|
||||
flags &= PRINTFLAG_BEEP;
|
||||
fgcolor = bgcolor = -1;
|
||||
break;
|
||||
case 22:
|
||||
/* reverse */
|
||||
if (!hide_text_style)
|
||||
flags ^= PRINTFLAG_REVERSE;
|
||||
break;
|
||||
case 31:
|
||||
/* underline */
|
||||
if (!hide_text_style)
|
||||
flags ^= PRINTFLAG_UNDERLINE;
|
||||
break;
|
||||
case 27:
|
||||
/* ansi color code */
|
||||
ptr = get_ansi_color(dest->window->theme == NULL ?
|
||||
current_theme : dest->window->theme,
|
||||
ptr,
|
||||
hide_text_style ? NULL : &fgcolor,
|
||||
hide_text_style ? NULL : &bgcolor,
|
||||
hide_text_style ? NULL : &flags);
|
||||
break;
|
||||
}
|
||||
|
||||
str = ptr;
|
||||
}
|
||||
|
||||
g_free(dup);
|
||||
}
|
||||
|
||||
static void read_settings(void)
|
||||
{
|
||||
hide_text_style = settings_get_bool("hide_text_style");
|
||||
}
|
||||
|
||||
void formats_init(void)
|
||||
{
|
||||
signal_gui_print_text = signal_get_uniq_id("gui print text");
|
||||
|
||||
read_settings();
|
||||
signal_add("setup changed", (SIGNAL_FUNC) read_settings);
|
||||
}
|
||||
|
||||
void formats_deinit(void)
|
||||
{
|
||||
signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue