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

fset: add ${min} and ${max}, add options fset.color.{max|min} and fset.color.{max|min}_selected

Browse Source
This commit is contained in:
Sébastien Helleu 2017-05-29 21:56:20 +02:00
parent 907501e465
commit 66124db856
5 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/fset/fset-buffer.c
View File

@ -246,6 +246,38 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
"value2", str_field);
}
/* min */
ptr_field = weechat_hdata_string (fset_hdata_fset_option,
fset_option, "min");
snprintf (str_field, sizeof (str_field), "%s", ptr_field);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"__min", str_field);
snprintf (str_field, sizeof (str_field),
"%s%s",
weechat_color (weechat_config_string (fset_config_color_min[selected_line])),
ptr_field);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"_min", str_field);
fset_buffer_fills_field (str_field, sizeof (str_field), "min", 8);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"min", str_field);
/* max */
ptr_field = weechat_hdata_string (fset_hdata_fset_option,
fset_option, "max");
snprintf (str_field, sizeof (str_field), "%s", ptr_field);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"__max", str_field);
snprintf (str_field, sizeof (str_field),
"%s%s",
weechat_color (weechat_config_string (fset_config_color_max[selected_line])),
ptr_field);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"_max", str_field);
fset_buffer_fills_field (str_field, sizeof (str_field), "max", 8);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"max", str_field);
/* set other variables depending on the value */
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"value_undef",

34
src/plugins/fset/fset-config.c
View File

@ -44,6 +44,8 @@ struct t_config_option *fset_config_format_option_current;
/* fset config, color section */
struct t_config_option *fset_config_color_default_value[2];
struct t_config_option *fset_config_color_max[2];
struct t_config_option *fset_config_color_min[2];
struct t_config_option *fset_config_color_name[2];
struct t_config_option *fset_config_color_parent_name[2];
struct t_config_option *fset_config_color_quotes[2];
@ -235,6 +237,38 @@ fset_config_init ()
NULL, NULL, NULL,
&fset_config_change_color, NULL, NULL,
NULL, NULL, NULL);
fset_config_color_max[0] = weechat_config_new_option (
fset_config_file, ptr_section,
"max", "color",
N_("color for max value"),
NULL, 0, 0, "default", NULL, 0,
NULL, NULL, NULL,
&fset_config_change_color, NULL, NULL,
NULL, NULL, NULL);
fset_config_color_max[1] = weechat_config_new_option (
fset_config_file, ptr_section,
"max_selected", "color",
N_("color for max value on the selected line"),
NULL, 0, 0, "white", NULL, 0,
NULL, NULL, NULL,
&fset_config_change_color, NULL, NULL,
NULL, NULL, NULL);
fset_config_color_min[0] = weechat_config_new_option (
fset_config_file, ptr_section,
"min", "color",
N_("color for min value"),
NULL, 0, 0, "default", NULL, 0,
NULL, NULL, NULL,
&fset_config_change_color, NULL, NULL,
NULL, NULL, NULL);
fset_config_color_min[1] = weechat_config_new_option (
fset_config_file, ptr_section,
"min_selected", "color",
N_("color for min value on the selected line"),
NULL, 0, 0, "white", NULL, 0,
NULL, NULL, NULL,
&fset_config_change_color, NULL, NULL,
NULL, NULL, NULL);
fset_config_color_name[0] = weechat_config_new_option (
fset_config_file, ptr_section,
"name", "color",

2
src/plugins/fset/fset-config.h
View File

@ -32,6 +32,8 @@ extern struct t_config_option *fset_config_format_option;
extern struct t_config_option *fset_config_format_option_current;
extern struct t_config_option *fset_config_color_default_value[2];
extern struct t_config_option *fset_config_color_max[2];
extern struct t_config_option *fset_config_color_min[2];
extern struct t_config_option *fset_config_color_name[2];
extern struct t_config_option *fset_config_color_parent_name[2];
extern struct t_config_option *fset_config_color_quotes[2];

44
src/plugins/fset/fset-option.c
View File

@ -243,6 +243,8 @@ fset_option_set_values (struct t_fset_option *fset_option,
const char *ptr_parent_name, *ptr_type;
void *ptr_default_value, *ptr_value;
struct t_config_option *ptr_parent_option;
int *ptr_min, *ptr_max;
char str_value[64];
/* parent name */
if (fset_option->parent_name)
@ -309,6 +311,26 @@ fset_option_set_values (struct t_fset_option *fset_option,
&fset_option->parent_value);
}
}
/* min value */
if (fset_option->min)
{
free (fset_option->min);
fset_option->min = NULL;
}
ptr_min = weechat_config_option_get_pointer (option, "min");
snprintf (str_value, sizeof (str_value), "%d", *ptr_min);
fset_option->min = strdup (str_value);
/* max value */
if (fset_option->max)
{
free (fset_option->max);
fset_option->max = NULL;
}
ptr_max = weechat_config_option_get_pointer (option, "max");
snprintf (str_value, sizeof (str_value), "%d", *ptr_max);
fset_option->max = strdup (str_value);
}
/*
@ -391,6 +413,14 @@ fset_option_set_max_length_fields_option (struct t_fset_option *fset_option)
if (!fset_option->value)
length += 4 + length_parent_value;
fset_option_set_max_length_field ("value2", length);
/* min */
fset_option_set_max_length_field (
"min", weechat_strlen_screen (fset_option->min));
/* max */
fset_option_set_max_length_field (
"max", weechat_strlen_screen (fset_option->max));
}
/*
@ -462,6 +492,8 @@ fset_option_alloc (struct t_config_file *config_file,
new_fset_option->default_value = NULL;
new_fset_option->value = NULL;
new_fset_option->parent_value = NULL;
new_fset_option->min = NULL;
new_fset_option->max = NULL;
fset_option_set_values (new_fset_option, option);
if (!fset_option_match_filters (ptr_config_name, ptr_section_name,
new_fset_option))
@ -582,6 +614,10 @@ fset_option_free (struct t_fset_option *fset_option)
free (fset_option->value);
if (fset_option->parent_value)
free (fset_option->parent_value);
if (fset_option->min)
free (fset_option->min);
if (fset_option->max)
free (fset_option->max);
free (fset_option);
}
@ -782,6 +818,8 @@ fset_option_hdata_option_cb (const void *pointer, void *data,
WEECHAT_HDATA_VAR(struct t_fset_option, default_value, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, value, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, parent_value, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, min, STRING, 0, NULL, NULL);
WEECHAT_HDATA_VAR(struct t_fset_option, max, STRING, 0, NULL, NULL);
}
return hdata;
}
@ -819,6 +857,10 @@ fset_option_add_to_infolist (struct t_infolist *infolist,
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "parent_value", fset_option->parent_value))
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "min", fset_option->min))
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "max", fset_option->max))
return 0;
return 1;
}
@ -845,6 +887,8 @@ fset_option_print_log ()
weechat_log_printf (" default_value . . . . : '%s'", ptr_fset_option->default_value);
weechat_log_printf (" value . . . . . . . . : '%s'", ptr_fset_option->value);
weechat_log_printf (" parent_value. . . . . : '%s'", ptr_fset_option->parent_value);
weechat_log_printf (" min . . . . . . . . . : '%s'", ptr_fset_option->min);
weechat_log_printf (" max . . . . . . . . . : '%s'", ptr_fset_option->max);
}
}

2
src/plugins/fset/fset-option.h
View File

@ -30,6 +30,8 @@ struct t_fset_option
char *default_value; /* option default value */
char *value; /* option value */
char *parent_value; /* parent option value */
char *min; /* min value */
char *max; /* max value */
struct t_fset_option *prev_option; /* link to previous option */
struct t_fset_option *next_option; /* link to next option */
};