foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: add local variable "highlight_regex" in buffers

v2.8-utf8proc
Sebastien Helleu 2011-06-15 17:43:46 +02:00
parent 49f7b5d701
commit 52d7770ff1
12 changed files with 190 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,12 +1,13 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.6-dev, 2011-06-13
v0.3.6-dev, 2011-06-15
Version 0.3.6 (under dev!)
--------------------------
* core: add local variable "highlight_regex" in buffers
* core: add "hdata" (direct access to WeeChat/plugin data)
* core: add option weechat.look.eat_newline_glitch (do not add new line at end
of each line displayed)

2
doc/de/autogen/plugin_api/hdata.txt
View File

@ -245,6 +245,8 @@
'text_search_found' (integer) +
'text_search_input' (string) +
'highlight_words' (string) +
'highlight_regex' (string) +
'highlight_regex_compiled' (pointer) +
'highlight_tags' (string) +
'highlight_tags_count' (integer) +
'highlight_tags_array' (pointer) +

2
doc/en/autogen/plugin_api/hdata.txt
View File

@ -245,6 +245,8 @@
'text_search_found' (integer) +
'text_search_input' (string) +
'highlight_words' (string) +
'highlight_regex' (string) +
'highlight_regex_compiled' (pointer) +
'highlight_tags' (string) +
'highlight_tags_count' (integer) +
'highlight_tags_array' (pointer) +

5
doc/en/weechat_plugin_api.en.txt
View File

@ -8756,6 +8756,7 @@ Arguments:
** 'input': input text
** 'text_search_input': input saved before text search
** 'highlight_words': list of words to highlight
** 'highlight_regex': regular expression for highlight
** 'highlight_tags': list of tags to highlight
** 'hotlist_max_level_nicks': max hotlist level for some nicks
** 'localvar_xxx': get content of local variable "xxx" (replace "xxx" by the
@ -8806,6 +8807,7 @@ Arguments:
* 'property': property name:
** 'plugin': pointer to plugin which created this buffer (NULL for WeeChat main
buffer)
** 'highlight_regex_compiled': regular expression 'highlight_regex' compiled
Return value:
@ -8911,6 +8913,9 @@ Arguments:
| highlight_words_del | comma separated list of words |
comma separated list of words to remove from highlighted words on buffer
| highlight_regex | any string |
regular expression for highlight
| highlight_tags | comma separated list of tags |
comma separated list of tags to highlight in this buffer

2
doc/fr/autogen/plugin_api/hdata.txt
View File

@ -245,6 +245,8 @@
'text_search_found' (integer) +
'text_search_input' (string) +
'highlight_words' (string) +
'highlight_regex' (string) +
'highlight_regex_compiled' (pointer) +
'highlight_tags' (string) +
'highlight_tags_count' (integer) +
'highlight_tags_array' (pointer) +

5
doc/fr/weechat_plugin_api.fr.txt
View File

@ -8892,6 +8892,7 @@ Paramètres :
** 'input' : texte saisi
** 'text_search_input' : texte saisi sauvegardé avant la recherche de texte
** 'highlight_words' : liste des mots pour le highlight
** 'highlight_regex' : expression régulière pour le highlight
** 'highlight_tags' : liste des étiquettes pour le highlight
** 'hotlist_max_level_nicks' : niveau maximum pour la hotlist pour certains
pseudos
@ -8943,6 +8944,7 @@ Paramètres :
* 'property' : nom de la propriété :
** 'plugin' : pointeur vers l'extension qui a créé le tampon (NULL pour le
tampon principal WeeChat)
** 'highlight_regex_compiled' : expression régulière 'highlight_regex' compilée
Valeur de retour :
@ -9055,6 +9057,9 @@ Paramètres :
liste de mots à supprimer de la liste des mots à mettre en valeur dans ce
tampon
| highlight_regex | toute chaîne |
expression régulière pour le highlight
| highlight_tags | liste d'étiquettes ("tags") séparées par des virgules |
liste d'étiquettes ("tags") à mettre en valeur pour ce tampon

2
doc/it/autogen/plugin_api/hdata.txt
View File

@ -245,6 +245,8 @@
'text_search_found' (integer) +
'text_search_input' (string) +
'highlight_words' (string) +
'highlight_regex' (string) +
'highlight_regex_compiled' (pointer) +
'highlight_tags' (string) +
'highlight_tags_count' (integer) +
'highlight_tags_array' (pointer) +

8
doc/it/weechat_plugin_api.it.txt
View File

@ -8814,6 +8814,8 @@ Argomenti:
** 'input': testo in ingresso
** 'text_search_input': input salvato prima della ricerca nel testo
** 'highlight_words': elenco di parole da evidenziare
// TRANSLATION MISSING
** 'highlight_regex': regular expression for highlight
** 'highlight_tags': elenco di tag da evidenziare
** 'hotlist_max_level_nicks': livello massimo della hotlist per alcuni nick
** 'localvar_xxx': ottiene il contenuto della variabile locale "xxx"
@ -8864,6 +8866,8 @@ Argomenti:
* 'property': nome proprietà:
** 'plugin': puntatore al plugin che ha creato questo buffer (NULL
per il buffer principale di WeeChat)
// TRANSLATION MISSING
** 'highlight_regex_compiled': regular expression 'highlight_regex' compiled
Valore restituito:
@ -8978,6 +8982,10 @@ Argomenti:
elenco di parole separate da virgole da rimuovere dalle
parole evidenziate nel buffer
// TRANSLATION MISSING
| highlight_regex | qualsiasi stringa |
regular expression for highlight
| highlight_tags | elenco separato da virgole di tag |
elenco separato da virgole di tag da evidenziare in questo buffer

2
src/core/wee-upgrade.c
View File

@ -414,6 +414,8 @@ upgrade_weechat_read_cb (void *data,
strdup (infolist_string (infolist, "text_search_input"));
gui_buffer_set_highlight_words (upgrade_current_buffer,
infolist_string (infolist, "highlight_words"));
gui_buffer_set_highlight_regex (upgrade_current_buffer,
infolist_string (infolist, "highlight_regex"));
gui_buffer_set_highlight_tags (upgrade_current_buffer,
infolist_string (infolist, "highlight_tags"));
gui_buffer_set_hotlist_max_level_nicks (upgrade_current_buffer,

212
src/gui/gui-buffer.c
View File

@ -90,19 +90,20 @@ char *gui_buffer_properties_get_integer[] =
};
char *gui_buffer_properties_get_string[] =
{ "plugin", "name", "short_name", "title", "input", "text_search_input",
"highlight_words", "highlight_tags", "hotlist_max_level_nicks",
"highlight_words", "highlight_regex", "highlight_tags",
"hotlist_max_level_nicks",
NULL
};
char *gui_buffer_properties_get_pointer[] =
{ "plugin",
{ "plugin", "highlight_regex_compiled",
NULL
};
char *gui_buffer_properties_set[] =
{ "unread", "display", "print_hooks_enabled", "number", "name", "short_name",
"type", "notify", "title", "time_for_each_line", "nicklist",
"nicklist_case_sensitive", "nicklist_display_groups", "highlight_words",
"highlight_words_add", "highlight_words_del", "highlight_tags",
"hotlist_max_level_nicks", "hotlist_max_level_nicks_add",
"highlight_words_add", "highlight_words_del", "highlight_regex",
"highlight_tags", "hotlist_max_level_nicks", "hotlist_max_level_nicks_add",
"hotlist_max_level_nicks_del", "input", "input_pos",
"input_get_unknown_commands",
NULL
@ -464,6 +465,8 @@ gui_buffer_new (struct t_weechat_plugin *plugin,
/* highlight */
new_buffer->highlight_words = NULL;
new_buffer->highlight_regex = NULL;
new_buffer->highlight_regex_compiled = NULL;
new_buffer->highlight_tags = NULL;
new_buffer->highlight_tags_count = 0;
new_buffer->highlight_tags_array = NULL;
@ -830,6 +833,8 @@ gui_buffer_get_string (struct t_gui_buffer *buffer, const char *property)
return buffer->text_search_input;
else if (string_strcasecmp (property, "highlight_words") == 0)
return buffer->highlight_words;
else if (string_strcasecmp (property, "highlight_regex") == 0)
return buffer->highlight_regex;
else if (string_strcasecmp (property, "highlight_tags") == 0)
return buffer->highlight_tags;
else if (string_strcasecmp (property, "hotlist_max_level_nicks") == 0)
@ -857,6 +862,8 @@ gui_buffer_get_pointer (struct t_gui_buffer *buffer, const char *property)
{
if (string_strcasecmp (property, "plugin") == 0)
return buffer->plugin;
else if (string_strcasecmp (property, "highlight_regex_compiled") == 0)
return buffer->highlight_regex_compiled;
}
return NULL;
@ -1154,6 +1161,47 @@ gui_buffer_remove_highlight_words (struct t_gui_buffer *buffer,
string_free_split (remove_words);
}
/*
* gui_buffer_set_highlight_regex: set highlight regex for a buffer
*/
void
gui_buffer_set_highlight_regex (struct t_gui_buffer *buffer,
const char *new_highlight_regex)
{
if (buffer->highlight_regex)
{
free (buffer->highlight_regex);
buffer->highlight_regex = NULL;
}
if (buffer->highlight_regex_compiled)
{
regfree (buffer->highlight_regex_compiled);
free (buffer->highlight_regex_compiled);
buffer->highlight_regex_compiled = NULL;
}
if (new_highlight_regex && new_highlight_regex[0])
{
buffer->highlight_regex = strdup (new_highlight_regex);
if (buffer->highlight_regex)
{
buffer->highlight_regex_compiled =
malloc (sizeof (*buffer->highlight_regex_compiled));
if (buffer->highlight_regex_compiled)
{
if (regcomp (buffer->highlight_regex_compiled,
buffer->highlight_regex,
REG_EXTENDED) != 0)
{
free (buffer->highlight_regex_compiled);
buffer->highlight_regex_compiled = NULL;
}
}
}
}
}
/*
* gui_buffer_set_highlight_tags: set highlight tags for a buffer
*/
@ -1163,9 +1211,16 @@ gui_buffer_set_highlight_tags (struct t_gui_buffer *buffer,
const char *new_highlight_tags)
{
if (buffer->highlight_tags)
{
free (buffer->highlight_tags);
buffer->highlight_tags = NULL;
}
if (buffer->highlight_tags_array)
{
string_free_split (buffer->highlight_tags_array);
buffer->highlight_tags_array = NULL;
}
buffer->highlight_tags_count = 0;
if (new_highlight_tags)
{
@ -1177,12 +1232,6 @@ gui_buffer_set_highlight_tags (struct t_gui_buffer *buffer,
&buffer->highlight_tags_count);
}
}
else
{
buffer->highlight_tags = NULL;
buffer->highlight_tags_count = 0;
buffer->highlight_tags_array = NULL;
}
}
/*
@ -1465,6 +1514,10 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
{
gui_buffer_remove_highlight_words (buffer, value);
}
else if (string_strcasecmp (property, "highlight_regex") == 0)
{
gui_buffer_set_highlight_regex (buffer, value);
}
else if (string_strcasecmp (property, "highlight_tags") == 0)
{
gui_buffer_set_highlight_tags (buffer, value);
@ -2076,6 +2129,13 @@ gui_buffer_close (struct t_gui_buffer *buffer)
gui_nicklist_remove_group (buffer, buffer->nicklist_root);
if (buffer->highlight_words)
free (buffer->highlight_words);
if (buffer->highlight_regex)
free (buffer->highlight_regex);
if (buffer->highlight_regex_compiled)
{
regfree (buffer->highlight_regex_compiled);
free (buffer->highlight_regex_compiled);
}
if (buffer->highlight_tags)
free (buffer->highlight_tags);
if (buffer->highlight_tags_array)
@ -2953,6 +3013,8 @@ gui_buffer_hdata_buffer_cb (void *data, const char *hdata_name)
HDATA_VAR(struct t_gui_buffer, text_search_found, INTEGER);
HDATA_VAR(struct t_gui_buffer, text_search_input, STRING);
HDATA_VAR(struct t_gui_buffer, highlight_words, STRING);
HDATA_VAR(struct t_gui_buffer, highlight_regex, STRING);
HDATA_VAR(struct t_gui_buffer, highlight_regex_compiled, POINTER);
HDATA_VAR(struct t_gui_buffer, highlight_tags, STRING);
HDATA_VAR(struct t_gui_buffer, highlight_tags_count, INTEGER);
HDATA_VAR(struct t_gui_buffer, highlight_tags_array, POINTER);
@ -3117,6 +3179,10 @@ gui_buffer_add_to_infolist (struct t_infolist *infolist,
return 0;
if (!infolist_new_var_string (ptr_item, "highlight_words", buffer->highlight_words))
return 0;
if (!infolist_new_var_string (ptr_item, "highlight_regex", buffer->highlight_regex))
return 0;
if (!infolist_new_var_pointer (ptr_item, "highlight_regex_compiled", buffer->highlight_regex_compiled))
return 0;
if (!infolist_new_var_string (ptr_item, "highlight_tags", buffer->highlight_tags))
return 0;
if (!infolist_new_var_string (ptr_item, "hotlist_max_level_nicks", hashtable_get_string (buffer->hotlist_max_level_nicks, "keys_values")))
@ -3230,78 +3296,80 @@ gui_buffer_print_log ()
{
log_printf ("");
log_printf ("[buffer (addr:0x%lx)]", ptr_buffer);
log_printf (" plugin . . . . . . . . : 0x%lx ('%s')",
log_printf (" plugin. . . . . . . . . : 0x%lx ('%s')",
ptr_buffer->plugin, plugin_get_name (ptr_buffer->plugin));
log_printf (" plugin_name_for_upgrade: '%s'", ptr_buffer->plugin_name_for_upgrade);
log_printf (" number . . . . . . . . : %d", ptr_buffer->number);
log_printf (" layout_number. . . . . : %d", ptr_buffer->layout_number);
log_printf (" layout_applied . . . . : %d", ptr_buffer->layout_applied);
log_printf (" name . . . . . . . . . : '%s'", ptr_buffer->name);
log_printf (" short_name . . . . . . : '%s'", ptr_buffer->short_name);
log_printf (" type . . . . . . . . . : %d", ptr_buffer->type);
log_printf (" notify . . . . . . . . : %d", ptr_buffer->notify);
log_printf (" num_displayed. . . . . : %d", ptr_buffer->num_displayed);
log_printf (" active . . . . . . . . : %d", ptr_buffer->active);
log_printf (" print_hooks_enabled. . : %d", ptr_buffer->print_hooks_enabled);
log_printf (" close_callback . . . . : 0x%lx", ptr_buffer->close_callback);
log_printf (" close_callback_data. . : 0x%lx", ptr_buffer->close_callback_data);
log_printf (" title. . . . . . . . . : '%s'", ptr_buffer->title);
log_printf (" own_lines. . . . . . . : 0x%lx", ptr_buffer->own_lines);
log_printf (" plugin_name_for_upgrade : '%s'", ptr_buffer->plugin_name_for_upgrade);
log_printf (" number. . . . . . . . . : %d", ptr_buffer->number);
log_printf (" layout_number . . . . . : %d", ptr_buffer->layout_number);
log_printf (" layout_applied. . . . . : %d", ptr_buffer->layout_applied);
log_printf (" name. . . . . . . . . . : '%s'", ptr_buffer->name);
log_printf (" short_name. . . . . . . : '%s'", ptr_buffer->short_name);
log_printf (" type. . . . . . . . . . : %d", ptr_buffer->type);
log_printf (" notify. . . . . . . . . : %d", ptr_buffer->notify);
log_printf (" num_displayed . . . . . : %d", ptr_buffer->num_displayed);
log_printf (" active. . . . . . . . . : %d", ptr_buffer->active);
log_printf (" print_hooks_enabled . . : %d", ptr_buffer->print_hooks_enabled);
log_printf (" close_callback. . . . . : 0x%lx", ptr_buffer->close_callback);
log_printf (" close_callback_data . . : 0x%lx", ptr_buffer->close_callback_data);
log_printf (" title . . . . . . . . . : '%s'", ptr_buffer->title);
log_printf (" own_lines . . . . . . . : 0x%lx", ptr_buffer->own_lines);
gui_lines_print_log (ptr_buffer->own_lines);
log_printf (" mixed_lines. . . . . . : 0x%lx", ptr_buffer->mixed_lines);
log_printf (" mixed_lines . . . . . . : 0x%lx", ptr_buffer->mixed_lines);
gui_lines_print_log (ptr_buffer->mixed_lines);
log_printf (" lines. . . . . . . . . : 0x%lx", ptr_buffer->lines);
log_printf (" time_for_each_line . . : %d", ptr_buffer->time_for_each_line);
log_printf (" chat_refresh_needed. . : %d", ptr_buffer->chat_refresh_needed);
log_printf (" nicklist . . . . . . . : %d", ptr_buffer->nicklist);
log_printf (" nicklist_case_sensitive: %d", ptr_buffer->nicklist_case_sensitive);
log_printf (" nicklist_root. . . . . : 0x%lx", ptr_buffer->nicklist_root);
log_printf (" nicklist_max_length. . : %d", ptr_buffer->nicklist_max_length);
log_printf (" nicklist_display_groups: %d", ptr_buffer->nicklist_display_groups);
log_printf (" nicklist_visible_count.: %d", ptr_buffer->nicklist_visible_count);
log_printf (" input. . . . . . . . . : %d", ptr_buffer->input);
log_printf (" input_callback . . . . : 0x%lx", ptr_buffer->input_callback);
log_printf (" input_callback_data. . : 0x%lx", ptr_buffer->input_callback_data);
log_printf (" input_get_unknown_cmd. : %d", ptr_buffer->input_get_unknown_commands);
log_printf (" input_buffer . . . . . : '%s'", ptr_buffer->input_buffer);
log_printf (" input_buffer_alloc . . : %d", ptr_buffer->input_buffer_alloc);
log_printf (" input_buffer_size. . . : %d", ptr_buffer->input_buffer_size);
log_printf (" input_buffer_length. . : %d", ptr_buffer->input_buffer_length);
log_printf (" input_buffer_pos . . . : %d", ptr_buffer->input_buffer_pos);
log_printf (" input_buffer_1st_disp. : %d", ptr_buffer->input_buffer_1st_display);
log_printf (" input_undo_snap->data. : '%s'", (ptr_buffer->input_undo_snap)->data);
log_printf (" input_undo_snap->pos . : %d", (ptr_buffer->input_undo_snap)->pos);
log_printf (" input_undo . . . . . . : 0x%lx", ptr_buffer->input_undo);
log_printf (" last_input_undo. . . . : 0x%lx", ptr_buffer->last_input_undo);
log_printf (" ptr_input_undo . . . . : 0x%lx", ptr_buffer->ptr_input_undo);
log_printf (" input_undo_count . . . : %d", ptr_buffer->input_undo_count);
log_printf (" lines . . . . . . . . . : 0x%lx", ptr_buffer->lines);
log_printf (" time_for_each_line. . . : %d", ptr_buffer->time_for_each_line);
log_printf (" chat_refresh_needed . . : %d", ptr_buffer->chat_refresh_needed);
log_printf (" nicklist. . . . . . . . : %d", ptr_buffer->nicklist);
log_printf (" nicklist_case_sensitive : %d", ptr_buffer->nicklist_case_sensitive);
log_printf (" nicklist_root . . . . . : 0x%lx", ptr_buffer->nicklist_root);
log_printf (" nicklist_max_length . . : %d", ptr_buffer->nicklist_max_length);
log_printf (" nicklist_display_groups : %d", ptr_buffer->nicklist_display_groups);
log_printf (" nicklist_visible_count. : %d", ptr_buffer->nicklist_visible_count);
log_printf (" input . . . . . . . . . : %d", ptr_buffer->input);
log_printf (" input_callback. . . . . : 0x%lx", ptr_buffer->input_callback);
log_printf (" input_callback_data . . : 0x%lx", ptr_buffer->input_callback_data);
log_printf (" input_get_unknown_cmd . : %d", ptr_buffer->input_get_unknown_commands);
log_printf (" input_buffer. . . . . . : '%s'", ptr_buffer->input_buffer);
log_printf (" input_buffer_alloc. . . : %d", ptr_buffer->input_buffer_alloc);
log_printf (" input_buffer_size . . . : %d", ptr_buffer->input_buffer_size);
log_printf (" input_buffer_length . . : %d", ptr_buffer->input_buffer_length);
log_printf (" input_buffer_pos. . . . : %d", ptr_buffer->input_buffer_pos);
log_printf (" input_buffer_1st_disp . : %d", ptr_buffer->input_buffer_1st_display);
log_printf (" input_undo_snap->data . : '%s'", (ptr_buffer->input_undo_snap)->data);
log_printf (" input_undo_snap->pos. . : %d", (ptr_buffer->input_undo_snap)->pos);
log_printf (" input_undo. . . . . . . : 0x%lx", ptr_buffer->input_undo);
log_printf (" last_input_undo . . . . : 0x%lx", ptr_buffer->last_input_undo);
log_printf (" ptr_input_undo. . . . . : 0x%lx", ptr_buffer->ptr_input_undo);
log_printf (" input_undo_count. . . . : %d", ptr_buffer->input_undo_count);
num = 0;
for (ptr_undo = ptr_buffer->input_undo; ptr_undo;
ptr_undo = ptr_undo->next_undo)
{
log_printf (" undo[%04d] . . . . . : 0x%lx ('%s' / %d)",
log_printf (" undo[%04d]. . . . . . : 0x%lx ('%s' / %d)",
num, ptr_undo, ptr_undo->data, ptr_undo->pos);
num++;
}
log_printf (" completion . . . . . . : 0x%lx", ptr_buffer->completion);
log_printf (" history. . . . . . . . : 0x%lx", ptr_buffer->history);
log_printf (" last_history . . . . . : 0x%lx", ptr_buffer->last_history);
log_printf (" ptr_history. . . . . . : 0x%lx", ptr_buffer->ptr_history);
log_printf (" num_history. . . . . . : %d", ptr_buffer->num_history);
log_printf (" text_search. . . . . . : %d", ptr_buffer->text_search);
log_printf (" text_search_exact. . . : %d", ptr_buffer->text_search_exact);
log_printf (" text_search_found. . . : %d", ptr_buffer->text_search_found);
log_printf (" text_search_input. . . : '%s'", ptr_buffer->text_search_input);
log_printf (" highlight_words. . . . : '%s'", ptr_buffer->highlight_words);
log_printf (" highlight_tags . . . . : '%s'", ptr_buffer->highlight_tags);
log_printf (" highlight_tags_count . : %d", ptr_buffer->highlight_tags_count);
log_printf (" highlight_tags_array . : 0x%lx", ptr_buffer->highlight_tags_array);
log_printf (" keys . . . . . . . . . : 0x%lx", ptr_buffer->keys);
log_printf (" last_key . . . . . . . : 0x%lx", ptr_buffer->last_key);
log_printf (" keys_count . . . . . . : %d", ptr_buffer->keys_count);
log_printf (" local_variables. . . . : 0x%lx", ptr_buffer->local_variables);
log_printf (" prev_buffer. . . . . . : 0x%lx", ptr_buffer->prev_buffer);
log_printf (" next_buffer. . . . . . : 0x%lx", ptr_buffer->next_buffer);
log_printf (" completion. . . . . . . : 0x%lx", ptr_buffer->completion);
log_printf (" history . . . . . . . . : 0x%lx", ptr_buffer->history);
log_printf (" last_history. . . . . . : 0x%lx", ptr_buffer->last_history);
log_printf (" ptr_history . . . . . . : 0x%lx", ptr_buffer->ptr_history);
log_printf (" num_history . . . . . . : %d", ptr_buffer->num_history);
log_printf (" text_search . . . . . . : %d", ptr_buffer->text_search);
log_printf (" text_search_exact . . . : %d", ptr_buffer->text_search_exact);
log_printf (" text_search_found . . . : %d", ptr_buffer->text_search_found);
log_printf (" text_search_input . . . : '%s'", ptr_buffer->text_search_input);
log_printf (" highlight_words . . . . : '%s'", ptr_buffer->highlight_words);
log_printf (" highlight_regex . . . . : '%s'", ptr_buffer->highlight_regex);
log_printf (" highlight_regex_compiled: 0x%lx", ptr_buffer->highlight_regex_compiled);
log_printf (" highlight_tags. . . . . : '%s'", ptr_buffer->highlight_tags);
log_printf (" highlight_tags_count. . : %d", ptr_buffer->highlight_tags_count);
log_printf (" highlight_tags_array. . : 0x%lx", ptr_buffer->highlight_tags_array);
log_printf (" keys. . . . . . . . . . : 0x%lx", ptr_buffer->keys);
log_printf (" last_key. . . . . . . . : 0x%lx", ptr_buffer->last_key);
log_printf (" keys_count. . . . . . . : %d", ptr_buffer->keys_count);
log_printf (" local_variables . . . . : 0x%lx", ptr_buffer->local_variables);
log_printf (" prev_buffer . . . . . . : 0x%lx", ptr_buffer->prev_buffer);
log_printf (" next_buffer . . . . . . : 0x%lx", ptr_buffer->next_buffer);
if (ptr_buffer->hotlist_max_level_nicks)
{

6
src/gui/gui-buffer.h
View File

@ -20,6 +20,8 @@
#ifndef __WEECHAT_GUI_BUFFER_H
#define __WEECHAT_GUI_BUFFER_H 1
#include <regex.h>
struct t_hashtable;
struct t_gui_window;
struct t_infolist;
@ -160,6 +162,8 @@ struct t_gui_buffer
/* highlight settings for buffer */
char *highlight_words; /* list of words to highlight */
char *highlight_regex; /* regex for highlight */
regex_t *highlight_regex_compiled; /* compiled regex */
char *highlight_tags; /* tags to highlight */
int highlight_tags_count; /* number of tags to highlight */
/* (if 0, any tag is highlighted) */
@ -239,6 +243,8 @@ extern void gui_buffer_set_title (struct t_gui_buffer *buffer,
const char *new_title);
extern void gui_buffer_set_highlight_words (struct t_gui_buffer *buffer,
const char *new_highlight_words);
extern void gui_buffer_set_highlight_regex (struct t_gui_buffer *buffer,
const char *new_highlight_regex);
extern void gui_buffer_set_highlight_tags (struct t_gui_buffer *buffer,
const char *new_highlight_tags);
extern void gui_buffer_set_hotlist_max_level_nicks (struct t_gui_buffer *buffer,

22
src/gui/gui-line.c
View File

@ -490,6 +490,12 @@ gui_line_has_highlight (struct t_gui_line *line)
config_highlight_regex);
}
if (!rc && line->data->buffer->highlight_regex_compiled)
{
rc = string_has_highlight_regex_compiled (msg_no_color,
line->data->buffer->highlight_regex_compiled);
}
free (msg_no_color);
return rc;
@ -1315,13 +1321,13 @@ gui_lines_print_log (struct t_gui_lines *lines)
{
if (lines)
{
log_printf (" first_line . . . . . : 0x%lx", lines->first_line);
log_printf (" last_line. . . . . . : 0x%lx", lines->last_line);
log_printf (" last_read_line . . . : 0x%lx", lines->last_read_line);
log_printf (" lines_count. . . . . : %d", lines->lines_count);
log_printf (" first_line_not_read. : %d", lines->first_line_not_read);
log_printf (" lines_hidden . . . . : %d", lines->lines_hidden);
log_printf (" buffer_max_length. . : %d", lines->buffer_max_length);
log_printf (" prefix_max_length. . : %d", lines->prefix_max_length);
log_printf (" first_line. . . . . . : 0x%lx", lines->first_line);
log_printf (" last_line . . . . . . : 0x%lx", lines->last_line);
log_printf (" last_read_line. . . . : 0x%lx", lines->last_read_line);
log_printf (" lines_count . . . . . : %d", lines->lines_count);
log_printf (" first_line_not_read . : %d", lines->first_line_not_read);
log_printf (" lines_hidden. . . . . : %d", lines->lines_hidden);
log_printf (" buffer_max_length . . : %d", lines->buffer_max_length);
log_printf (" prefix_max_length . . : %d", lines->prefix_max_length);
}
}