pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 15:26:37 +02:00
Code Activity

Fix refresh bug when bar priority is changed with /set command

Browse Source
This commit is contained in:
Sebastien Helleu
2008-06-24 15:30:25 +02:00
parent f8e8feb018
commit c38eac19e3
2 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-bar.c
+54 -36
View File
@@ -336,6 +336,59 @@ gui_bar_config_check_type (void *data, struct t_config_option *option,
return 0;
}
/*
* gui_bar_config_change_priority: callback when priority is changed
*/
void
gui_bar_config_change_priority (void *data, struct t_config_option *option)
{
struct t_gui_bar *ptr_bar;
struct t_gui_window *ptr_win;
/* make C compiler happy */
(void) data;
ptr_bar = gui_bar_search_with_option_name (option->name);
if (ptr_bar)
{
/* remove bar from list */
if (ptr_bar == gui_bars)
{
gui_bars = ptr_bar->next_bar;
gui_bars->prev_bar = NULL;
}
if (ptr_bar == last_gui_bar)
{
last_gui_bar = ptr_bar->prev_bar;
last_gui_bar->next_bar = NULL;
}
if (ptr_bar->prev_bar)
(ptr_bar->prev_bar)->next_bar = ptr_bar->next_bar;
if (ptr_bar->next_bar)
(ptr_bar->next_bar)->prev_bar = ptr_bar->prev_bar;
gui_bar_insert (ptr_bar);
/* free bar windows */
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
gui_bar_free_bar_windows (ptr_bar);
}
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if (CONFIG_INTEGER(ptr_bar->type) != GUI_BAR_TYPE_ROOT)
gui_bar_window_new (ptr_bar, ptr_win);
}
}
}
gui_window_refresh_needed = 1;
}
/*
* gui_bar_config_change_conditions: callback when conditions is changed
*/
@@ -635,8 +688,6 @@ gui_bar_set_priority (struct t_gui_bar *bar, const char *priority)
{
long number;
char *error;
struct t_gui_bar *ptr_bar;
struct t_gui_window *ptr_win;
error = NULL;
number = strtol (priority, &error, 10);
@@ -650,39 +701,6 @@ gui_bar_set_priority (struct t_gui_bar *bar, const char *priority)
return;
config_file_option_set (bar->priority, priority, 1);
/* remove bar from list */
if (bar == gui_bars)
{
gui_bars = bar->next_bar;
gui_bars->prev_bar = NULL;
}
if (bar == last_gui_bar)
{
last_gui_bar = bar->prev_bar;
last_gui_bar->next_bar = NULL;
}
if (bar->prev_bar)
(bar->prev_bar)->next_bar = bar->next_bar;
if (bar->next_bar)
(bar->next_bar)->prev_bar = bar->prev_bar;
gui_bar_insert (bar);
/* free bar windows */
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
gui_bar_free_bar_windows (ptr_bar);
}
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if (CONFIG_INTEGER(ptr_bar->type) != GUI_BAR_TYPE_ROOT)
gui_bar_window_new (ptr_bar, ptr_win);
}
}
}
}
@@ -892,7 +910,7 @@ gui_bar_create_option (const char *bar_name, int index_option, const char *value
option_name, "integer",
N_("bar priority (high number means bar displayed first)"),
NULL, 0, INT_MAX, value,
NULL, NULL, NULL, NULL, NULL, NULL);
NULL, NULL, &gui_bar_config_change_priority, NULL, NULL, NULL);
break;
case GUI_BAR_OPTION_TYPE:
ptr_option = config_file_new_option (
src/gui/gui-bar.h
-1
View File
@@ -116,7 +116,6 @@ extern int gui_bar_check_conditions_for_window (struct t_gui_bar *bar,
extern int gui_bar_root_get_size (struct t_gui_bar *bar,
enum t_gui_bar_position position);
extern struct t_gui_bar *gui_bar_search (const char *name);
extern void gui_bar_set_current_size (struct t_gui_bar *bar, int current_size);
extern int gui_bar_set (struct t_gui_bar *bar, const char *property, const char *value);
extern void gui_bar_create_option_temp (struct t_gui_bar *temp_bar,
int index_option, const char *value);