pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 06:16:40 +02:00
Code Activity

fset: improve speed when marking/unmarking options, fix refresh of buffer title

Browse Source
This commit is contained in:
Sébastien Helleu
2017-06-26 23:20:47 +02:00
parent b199667f8c
commit d8d753d332
4 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/fset/fset-buffer.c
+8 -10
View File
@@ -159,7 +159,7 @@ fset_buffer_fills_field (char *field, char *field_spaces, int size,
*/
void
fset_buffer_display_line (int index, struct t_fset_option *fset_option)
fset_buffer_display_option (struct t_fset_option *fset_option)
{
char *line, str_color_line[128], *color_line, **lines, str_field[4096], str_field2[4096];
char str_color_value[128], str_color_quotes[128], str_number[64];
@@ -170,7 +170,7 @@ fset_buffer_display_line (int index, struct t_fset_option *fset_option)
if (!fset_option)
return;
selected_line = (index == fset_buffer_selected_line) ? 1 : 0;
selected_line = (fset_option->index == fset_buffer_selected_line) ? 1 : 0;
default_value_undef = (fset_option->default_value == NULL) ? 1 : 0;
value_undef = (fset_option->value == NULL) ? 1 : 0;
@@ -675,13 +675,13 @@ fset_buffer_display_line (int index, struct t_fset_option *fset_option)
"empty_marked", str_field2);
/* index */
snprintf (str_field, sizeof (str_field), "%d", index + 1);
snprintf (str_field, sizeof (str_field), "%d", fset_option->index + 1);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"__index", str_field);
snprintf (str_field, sizeof (str_field),
"%s%d",
weechat_color (weechat_config_string (fset_config_color_index[selected_line])),
index + 1);
fset_option->index + 1);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"_index", str_field);
snprintf (str_number, sizeof (str_number),
@@ -742,7 +742,7 @@ fset_buffer_display_line (int index, struct t_fset_option *fset_option)
lines = weechat_string_split (line, "\r\n", 0, 0, &num_lines);
if (lines)
{
y = index * fset_config_format_option_num_lines[format_number - 1];
y = fset_option->index * fset_config_format_option_num_lines[format_number - 1];
for (i = 0; i < num_lines; i++)
{
weechat_printf_y (fset_buffer, y, "%s%s",
@@ -781,7 +781,7 @@ fset_buffer_refresh (int clear)
{
ptr_fset_option = weechat_arraylist_get (fset_options, i);
if (ptr_fset_option)
fset_buffer_display_line (i, ptr_fset_option);
fset_buffer_display_option (ptr_fset_option);
}
fset_buffer_set_title ();
@@ -804,12 +804,10 @@ fset_buffer_set_current_line (int line)
if (old_line != fset_buffer_selected_line)
{
fset_buffer_display_line (
old_line,
fset_buffer_display_option (
weechat_arraylist_get (fset_options, old_line));
}
fset_buffer_display_line (
fset_buffer_selected_line,
fset_buffer_display_option (
weechat_arraylist_get (fset_options, fset_buffer_selected_line));
fset_buffer_set_title ();
src/plugins/fset/fset-buffer.h
+1 -2
View File
@@ -28,8 +28,7 @@ extern struct t_gui_buffer *fset_buffer;
extern int fset_buffer_selected_line;
extern void fset_buffer_set_title ();
extern void fset_buffer_display_line (int index,
struct t_fset_option *fset_option);
extern void fset_buffer_display_option (struct t_fset_option *fset_option);
extern void fset_buffer_refresh (int clear);
extern void fset_buffer_set_current_line (int line);
extern void fset_buffer_check_line_outside_window ();
src/plugins/fset/fset-option.c
+38 -6
View File
@@ -759,6 +759,7 @@ fset_option_alloc (struct t_config_option *option)
if (!new_fset_option)
return NULL;
new_fset_option->index = 0;
new_fset_option->file = NULL;
new_fset_option->section = NULL;
new_fset_option->option = NULL;
@@ -1007,6 +1008,13 @@ fset_option_get_options ()
num_options = weechat_arraylist_size (fset_options);
for (i = 0; i < num_options; i++)
{
ptr_fset_option = weechat_arraylist_get (fset_options, i);
if (ptr_fset_option)
ptr_fset_option->index = i;
}
/* check selected line */
if (num_options == 0)
fset_buffer_selected_line = 0;
@@ -1195,7 +1203,7 @@ fset_option_toggle_mark (struct t_fset_option *fset_option,
fset_option->marked ^= 1;
fset_option_count_marked += (fset_option->marked) ? 1 : -1;
fset_buffer_refresh (0);
fset_buffer_display_option (fset_option);
}
/*
@@ -1205,9 +1213,11 @@ fset_option_toggle_mark (struct t_fset_option *fset_option,
void
fset_option_mark_options_matching_filter (const char *filter, int mark)
{
int num_options, i, mark_old, matching;
int num_options, i, mark_old, matching, set_title;
struct t_fset_option *ptr_fset_option;
set_title = 0;
num_options = weechat_arraylist_size (fset_options);
for (i = 0; i < num_options; i++)
{
@@ -1222,16 +1232,22 @@ fset_option_mark_options_matching_filter (const char *filter, int mark)
{
ptr_fset_option->marked = 1;
fset_option_count_marked++;
fset_buffer_display_option (ptr_fset_option);
set_title = 1;
}
else if (mark_old && !mark)
{
ptr_fset_option->marked = 0;
fset_option_count_marked--;
fset_buffer_display_option (ptr_fset_option);
set_title = 1;
}
}
}
}
fset_buffer_refresh (0);
if (set_title)
fset_buffer_set_title ();
}
/*
@@ -1241,18 +1257,30 @@ fset_option_mark_options_matching_filter (const char *filter, int mark)
void
fset_option_unmark_all ()
{
int num_options, i;
int num_options, marked, set_title, i;
struct t_fset_option *ptr_fset_option;
set_title = 0;
num_options = weechat_arraylist_size (fset_options);
for (i = 0; i < num_options; i++)
{
ptr_fset_option = weechat_arraylist_get (fset_options, i);
if (ptr_fset_option)
{
marked = ptr_fset_option->marked;
ptr_fset_option->marked = 0;
if (marked)
{
fset_buffer_display_option (ptr_fset_option);
set_title = 1;
}
}
}
fset_option_count_marked = 0;
fset_buffer_refresh (0);
if (set_title)
fset_buffer_set_title ();
}
/*
@@ -1365,7 +1393,7 @@ fset_option_config_changed (const char *option_name)
if (ptr_option)
{
fset_option_set_values (ptr_fset_option, ptr_option);
fset_buffer_display_line (line, ptr_fset_option);
fset_buffer_display_option (ptr_fset_option);
}
else
{
@@ -1553,6 +1581,7 @@ fset_option_hdata_option_cb (const void *pointer, void *data,
hdata = weechat_hdata_new (hdata_name, NULL, NULL, 0, 0, NULL, NULL);
if (hdata)
{
WEECHAT_HDATA_VAR(struct t_fset_option, index, INTEGER, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, file, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, section, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, option, STRING, 0, NULL, NULL);
@@ -1592,6 +1621,8 @@ fset_option_add_to_infolist (struct t_infolist *infolist,
if (!ptr_item)
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "index", fset_option->index))
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "file", fset_option->file))
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "section", fset_option->section))
@@ -1648,6 +1679,7 @@ fset_option_print_log ()
continue;
weechat_log_printf ("");
weechat_log_printf ("[fset option (addr:0x%lx)]", ptr_fset_option);
weechat_log_printf (" index . . . . . . . . : '%s'", ptr_fset_option->index);
weechat_log_printf (" file. . . . . . . . . : '%s'", ptr_fset_option->file);
weechat_log_printf (" section . . . . . . . : '%s'", ptr_fset_option->section);
weechat_log_printf (" option. . . . . . . . : '%s'", ptr_fset_option->option);
src/plugins/fset/fset-option.h
+1
View File
@@ -34,6 +34,7 @@ enum t_fset_option_type
struct t_fset_option
{
int index; /* index of option in list */
char *file; /* config file name (eg: "weechat")*/
char *section; /* section name (eg: "look") */
char *option; /* option name */