aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-15 04:28:09 -04:00
Code

Make last_{fg,bg,flags} members of TEXT_BUFFER_REC.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4804 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-04-16 20:32:36 +00:00 committed by exg
parent 2aac604293
commit 77dd63ac83
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fe-text/textbuffer.c
View File

@ -40,6 +40,8 @@ TEXT_BUFFER_REC *textbuffer_create(void)
buffer = g_mem_chunk_alloc0(buffer_chunk); buffer = g_mem_chunk_alloc0(buffer_chunk);
buffer->last_eol = TRUE; buffer->last_eol = TRUE;
buffer->last_fg = LINE_COLOR_DEFAULT;
buffer->last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG;
return buffer; return buffer;
} }
@ -266,8 +268,6 @@ int textbuffer_line_exists_after(LINE_REC *line, LINE_REC *search)
return FALSE; return FALSE;
} }
static int last_fg, last_bg, last_flags;
void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line, void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
int fg, int bg, int flags) int fg, int bg, int flags)
{ {
@ -283,22 +283,22 @@ void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
bg |= LINE_COLOR_BLINK; bg |= LINE_COLOR_BLINK;
pos = 0; pos = 0;
if (fg != last_fg) { if (fg != buffer->last_fg) {
last_fg = fg; buffer->last_fg = fg;
data[pos++] = 0; data[pos++] = 0;
data[pos++] = fg == 0 ? LINE_CMD_COLOR0 : fg; data[pos++] = fg == 0 ? LINE_CMD_COLOR0 : fg;
} }
if (bg != last_bg) { if (bg != buffer->last_bg) {
last_bg = bg; buffer->last_bg = bg;
data[pos++] = 0; data[pos++] = 0;
data[pos++] = bg; data[pos++] = bg;
} }
if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (last_flags & GUI_PRINT_FLAG_UNDERLINE)) { if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (buffer->last_flags & GUI_PRINT_FLAG_UNDERLINE)) {
data[pos++] = 0; data[pos++] = 0;
data[pos++] = LINE_CMD_UNDERLINE; data[pos++] = LINE_CMD_UNDERLINE;
} }
if ((flags & GUI_PRINT_FLAG_REVERSE) != (last_flags & GUI_PRINT_FLAG_REVERSE)) { if ((flags & GUI_PRINT_FLAG_REVERSE) != (buffer->last_flags & GUI_PRINT_FLAG_REVERSE)) {
data[pos++] = 0; data[pos++] = 0;
data[pos++] = LINE_CMD_REVERSE; data[pos++] = LINE_CMD_REVERSE;
} }
@ -310,7 +310,7 @@ void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
if (pos > 0) if (pos > 0)
*line = textbuffer_insert(buffer, *line, data, pos, NULL); *line = textbuffer_insert(buffer, *line, data, pos, NULL);
last_flags = flags; buffer->last_flags = flags;
} }
LINE_REC *textbuffer_append(TEXT_BUFFER_REC *buffer, LINE_REC *textbuffer_append(TEXT_BUFFER_REC *buffer,
@ -344,9 +344,9 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
data[len-2] == 0 && data[len-1] == LINE_CMD_EOL; data[len-2] == 0 && data[len-1] == LINE_CMD_EOL;
if (buffer->last_eol) { if (buffer->last_eol) {
last_fg = LINE_COLOR_DEFAULT; buffer->last_fg = LINE_COLOR_DEFAULT;
last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG; buffer->last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG;
last_flags = 0; buffer->last_flags = 0;
} }
return line; return line;
@ -590,8 +590,6 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
void textbuffer_init(void) void textbuffer_init(void)
{ {
last_fg = LINE_COLOR_DEFAULT;
last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG;
buffer_chunk = g_mem_chunk_new("text buffer chunk", buffer_chunk = g_mem_chunk_new("text buffer chunk",
sizeof(TEXT_BUFFER_REC), sizeof(TEXT_BUFFER_REC),
sizeof(TEXT_BUFFER_REC)*32, G_ALLOC_AND_FREE); sizeof(TEXT_BUFFER_REC)*32, G_ALLOC_AND_FREE);

3
src/fe-text/textbuffer.h
View File

@ -65,6 +65,9 @@ typedef struct {
TEXT_CHUNK_REC *cur_text; TEXT_CHUNK_REC *cur_text;
unsigned int last_eol:1; unsigned int last_eol:1;
int last_fg;
int last_bg;
int last_flags;
} TEXT_BUFFER_REC; } TEXT_BUFFER_REC;
/* Create new buffer */ /* Create new buffer */