diff --git a/po/cs.po b/po/cs.po index c8cb0cdc8..ec264da2a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -94,7 +94,9 @@ msgid "List of bars:" msgstr "Seznam pro aliasy:\n" #, fuzzy, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n" msgid "(hidden)" @@ -1719,7 +1721,12 @@ msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" diff --git a/po/de.po b/po/de.po index bc2a7864b..063805a5d 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -99,7 +99,9 @@ msgid "List of bars:" msgstr "Liste der Aliases:\n" #, fuzzy, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "%sin %s%s%s/%s%s%s:%s ignoriere %s%s%s von %s%s\n" msgid "(hidden)" @@ -1720,7 +1722,12 @@ msgstr "Nicklisten-Position (top, left, right (Standard), bottom)" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" diff --git a/po/es.po b/po/es.po index 8d5e67b46..23ef1c333 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: 2007-09-19 12:09+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" @@ -96,7 +96,9 @@ msgid "List of bars:" msgstr "Lista de alias:\n" #, fuzzy, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "%sen %s%s%s/%s%s%s:%s ignorando %s%s%s de %s%s\n" msgid "(hidden)" @@ -1103,8 +1105,8 @@ msgstr "la cadena mostrada tras la finalización de los nombres de usuario" #, fuzzy msgid "use a marker (line or char) on buffers to show first unread line" msgstr "" -"usar un marcador en los servidores/canales para mostrar la primera línea " -"sin leer" +"usar un marcador en los servidores/canales para mostrar la primera línea sin " +"leer" #, fuzzy msgid "save configuration file on exit" @@ -1618,8 +1620,8 @@ msgid "" "support.\n" "Be careful, private info may be in these files.\n" msgstr "" -"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los " -"desarrolladores de Weechat para el soporte.\n" +"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los desarrolladores " +"de Weechat para el soporte.\n" "Sé cuidadoso, puede que haya información privada en estos ficheros.\n" #, c-format @@ -1703,7 +1705,12 @@ msgstr "" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" @@ -5503,8 +5510,8 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ "maximum number of lines in history for one server/channel/private window " #~ "(0 = unlimited)" #~ msgstr "" -#~ "número máximo de líneas en el histórico para un servidor/canal/" -#~ "privado (0 = ilimitado)" +#~ "número máximo de líneas en el histórico para un servidor/canal/privado " +#~ "(0 = ilimitado)" #, fuzzy #~ msgid "log messages from plugins" @@ -5698,8 +5705,8 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ "max size for aligning nick and other messages (should be >= to " #~ "look_align_size)" #~ msgstr "" -#~ "tamaño máximo para la alineación de nick y otros mensajes (debería " -#~ "ser >= a look_align_size)" +#~ "tamaño máximo para la alineación de nick y otros mensajes (debería ser " +#~ ">= a look_align_size)" #~ msgid "server name not found" #~ msgstr "nombre de servidor no encontrado" @@ -6486,8 +6493,7 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ msgid "color for chan owner symbol (specific to unrealircd)" #~ msgstr "" -#~ "color para el símbolo de propietario de canal (especificado en " -#~ "unrealircd)" +#~ "color para el símbolo de propietario de canal (especificado en unrealircd)" #~ msgid "color for chan admin symbol" #~ msgstr "color para el símbolo de administrador de canal" diff --git a/po/fr.po b/po/fr.po index ea97fda69..1f6849592 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" -"PO-Revision-Date: 2008-07-06 11:27+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" +"PO-Revision-Date: 2008-07-10 17:36+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -94,8 +94,10 @@ msgid "List of bars:" msgstr "Liste des barres:" #, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" -msgstr " %s%s%s: %s%s%s (cond: %s), %s, remplissage: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" +msgstr " %s%s%s: %s%s%s (cond: %s), %s, remplissage: %s(haut/bas)/%s(gauche/droite), %s: %s" msgid "(hidden)" msgstr "(caché)" @@ -1707,10 +1709,13 @@ msgstr "" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" -msgstr "" -"direction de remplissage de la barre (\"horizontal\" (de gauche à droite) ou " -"\"vertical\" (de haut en bas))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "direction de remplissage de la barre (\"horizontal\" (de gauche à droite) ou \"vertical\" (de haut en bas)) quand la position de la barre est haut ou bas" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" +msgstr "direction de remplissage de la barre (\"horizontal\" (de gauche à droite) ou \"vertical\" (de haut en bas)) quand la position de la barre est gauche ou droite" msgid "bar size in chars (0 = auto size)" msgstr "taille de la barre en caractères (0 = taille automatique)" diff --git a/po/hu.po b/po/hu.po index c001534da..432676650 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: 2007-10-10 18:07+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -100,7 +100,9 @@ msgid "List of bars:" msgstr "Aliaszok listája:\n" #, fuzzy, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "%s %s%s%s/%s%s%s:%s %s%s%s mellőzése a következő(k)től: %s%s\n" msgid "(hidden)" @@ -1725,7 +1727,12 @@ msgstr "névlista helye (top, left, right (alapértelmezett), bottom)" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" diff --git a/po/ru.po b/po/ru.po index f598516d8..ea6fe2df5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -96,7 +96,9 @@ msgid "List of bars:" msgstr "Список сокращений:\n" #, fuzzy, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "%sна %s%s%s/%s%s%s:%s игнорирует %s%s%s с %s%s\n" msgid "(hidden)" @@ -1728,7 +1730,12 @@ msgstr "" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" diff --git a/po/weechat.pot b/po/weechat.pot index 812f7d9e0..2100e12ba 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-07-06 11:26+0200\n" +"POT-Creation-Date: 2008-07-10 17:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,9 @@ msgid "List of bars:" msgstr "" #, c-format -msgid " %s%s%s: %s%s%s (cond: %s), %s, filling: %s, %s: %s" +msgid "" +" %s%s%s: %s%s%s (cond: %s), %s, filling: %s(top/bottom)/%s(left/right), %s: " +"%s" msgstr "" msgid "(hidden)" @@ -1436,7 +1438,12 @@ msgstr "" msgid "" "bar filling direction (\"horizontal\" (from left to right) or \"vertical" -"\" (from top to bottom))" +"\" (from top to bottom)) when bar position is top or bottom" +msgstr "" + +msgid "" +"bar filling direction (\"horizontal\" (from left to right) or \"vertical" +"\" (from top to bottom)) when bar position is left or right" msgstr "" msgid "bar size in chars (0 = auto size)" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 9d21fe975..32e4bf72c 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -80,7 +80,8 @@ command_bar_list (int full) { gui_chat_printf (NULL, _(" %s%s%s: %s%s%s (cond: %s), %s, " - "filling: %s, %s: %s"), + "filling: %s(top/bottom)/%s(left/right), " + "%s: %s"), GUI_COLOR(GUI_COLOR_CHAT_BUFFER), ptr_bar->name, GUI_COLOR(GUI_COLOR_CHAT), @@ -91,7 +92,8 @@ command_bar_list (int full) && CONFIG_STRING(ptr_bar->conditions)[0]) ? CONFIG_STRING(ptr_bar->conditions) : "-", gui_bar_position_string[CONFIG_INTEGER(ptr_bar->position)], - gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling)], + gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling_top_bottom)], + gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling_left_right)], ((CONFIG_INTEGER(ptr_bar->position) == GUI_BAR_POSITION_BOTTOM) || (CONFIG_INTEGER(ptr_bar->position) == GUI_BAR_POSITION_TOP)) ? _("height") : _("width"), @@ -247,9 +249,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, if (gui_bar_new (NULL, argv[2], "0", "0", str_type, (pos_condition) ? pos_condition : "", argv[4], - ((position == GUI_BAR_POSITION_LEFT) - || (position == GUI_BAR_POSITION_RIGHT)) ? - "vertical" : "horizontal", + "horizontal", "vertical", argv[5], "0", "default", "default", "default", argv[6], argv_eol[7])) { diff --git a/src/gui/curses/gui-curses-bar.c b/src/gui/curses/gui-curses-bar.c index 8aacb980c..f48af84dc 100644 --- a/src/gui/curses/gui-curses-bar.c +++ b/src/gui/curses/gui-curses-bar.c @@ -789,7 +789,7 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window, size_on_screen = utf8_char_size_screen (utf_char); if (*x + size_on_screen > bar_window->width) { - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_VERTICAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_VERTICAL) return 0; if (*y >= bar_window->height - 1) return 0; @@ -856,7 +856,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, { if (item_value[0]) { - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_HORIZONTAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_HORIZONTAL) { item_value2 = string_replace (item_value, "\n", space_with_reinit_color); @@ -875,7 +875,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, content_length += length_reinit_color + strlen ((item_value2) ? item_value2 : item_value); content = realloc (content, content_length); - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_HORIZONTAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_HORIZONTAL) strcat (content, space_with_reinit_color); else strcat (content, "\n"); @@ -932,7 +932,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, { case GUI_BAR_POSITION_BOTTOM: case GUI_BAR_POSITION_TOP: - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_HORIZONTAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_HORIZONTAL) num_lines = optimal_number_of_lines; else num_lines = items_count; @@ -979,7 +979,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, { some_data_not_displayed = 1; } - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_VERTICAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_VERTICAL) { x = 0; y++; @@ -1049,7 +1049,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, { if (item_value[0]) { - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_HORIZONTAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_HORIZONTAL) { item_value2 = string_replace (item_value, "\n", space_with_reinit_color); @@ -1080,7 +1080,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, { some_data_not_displayed = 1; } - if (CONFIG_INTEGER(bar_window->bar->filling) == GUI_BAR_FILLING_VERTICAL) + if (CONFIG_INTEGER(gui_bar_get_option_filling (bar_window->bar)) == GUI_BAR_FILLING_VERTICAL) { x = 0; y++; diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c index e513b6967..e07b57173 100644 --- a/src/gui/gui-bar.c +++ b/src/gui/gui-bar.c @@ -40,8 +40,9 @@ char *gui_bar_option_string[GUI_BAR_NUM_OPTIONS] = -{ "hidden", "priority", "type", "conditions", "position", "filling", "size", - "size_max", "color_fg", "color_delim", "color_bg", "separator", "items" }; +{ "hidden", "priority", "type", "conditions", "position", "filling_top_bottom", + "filling_left_right", "size", "size_max", "color_fg", "color_delim", + "color_bg", "separator", "items" }; char *gui_bar_type_string[GUI_BAR_NUM_TYPES] = { "root", "window" }; char *gui_bar_position_string[GUI_BAR_NUM_POSITIONS] = @@ -120,6 +121,24 @@ gui_bar_search_position (const char *position) return -1; } +/* + * gui_bar_get_option_filling: return pointer to filling option + * if position is top/bottom, then return pointer + * on option "filling_top_bottom" + * if position is left/right, then return pointer + * on option "filling_left_right" + */ + +struct t_config_option * +gui_bar_get_option_filling (struct t_gui_bar *bar) +{ + if ((CONFIG_INTEGER(bar->position) == GUI_BAR_POSITION_BOTTOM) + || (CONFIG_INTEGER(bar->position) == GUI_BAR_POSITION_TOP)) + return bar->filling_top_bottom; + + return bar->filling_left_right; +} + /* * gui_bar_find_pos: find position for a bar in list (keeping list sorted * by priority) @@ -713,8 +732,10 @@ gui_bar_set_name (struct t_gui_bar *bar, const char *name) config_file_option_rename (bar->conditions, option_name); snprintf (option_name, length, "%s.position", name); config_file_option_rename (bar->position, option_name); - snprintf (option_name, length, "%s.filling", name); - config_file_option_rename (bar->filling, option_name); + snprintf (option_name, length, "%s.filling_top_bottom", name); + config_file_option_rename (bar->filling_top_bottom, option_name); + snprintf (option_name, length, "%s.filling_left_right", name); + config_file_option_rename (bar->filling_left_right, option_name); snprintf (option_name, length, "%s.size", name); config_file_option_rename (bar->size, option_name); snprintf (option_name, length, "%s.size_max", name); @@ -890,9 +911,14 @@ gui_bar_set (struct t_gui_bar *bar, const char *property, const char *value) gui_bar_set_position (bar, value); return 1; } - else if (string_strcasecmp (property, "filling") == 0) + else if (string_strcasecmp (property, "filling_top_bottom") == 0) { - config_file_option_set (bar->filling, value, 1); + config_file_option_set (bar->filling_top_bottom, value, 1); + return 1; + } + else if (string_strcasecmp (property, "filling_left_right") == 0) + { + config_file_option_set (bar->filling_left_right, value, 1); return 1; } else if (string_strcasecmp (property, "size") == 0) @@ -1007,12 +1033,23 @@ gui_bar_create_option (const char *bar_name, int index_option, const char *value "bottom|top|left|right", 0, 0, value, NULL, NULL, &gui_bar_config_change_position, NULL, NULL, NULL); break; - case GUI_BAR_OPTION_FILLING: + case GUI_BAR_OPTION_FILLING_TOP_BOTTOM: ptr_option = config_file_new_option ( weechat_config_file, weechat_config_section_bar, option_name, "integer", N_("bar filling direction (\"horizontal\" (from left to " - "right) or \"vertical\" (from top to bottom))"), + "right) or \"vertical\" (from top to bottom)) when bar " + "position is top or bottom"), + "horizontal|vertical", 0, 0, value, + NULL, NULL, &gui_bar_config_change_filling, NULL, NULL, NULL); + break; + case GUI_BAR_OPTION_FILLING_LEFT_RIGHT: + ptr_option = config_file_new_option ( + weechat_config_file, weechat_config_section_bar, + option_name, "integer", + N_("bar filling direction (\"horizontal\" (from left to " + "right) or \"vertical\" (from top to bottom)) when bar " + "position is left or right"), "horizontal|vertical", 0, 0, value, NULL, NULL, &gui_bar_config_change_filling, NULL, NULL, NULL); break; @@ -1123,8 +1160,11 @@ gui_bar_create_option_temp (struct t_gui_bar *temp_bar, int index_option, case GUI_BAR_OPTION_POSITION: temp_bar->position = new_option; break; - case GUI_BAR_OPTION_FILLING: - temp_bar->filling = new_option; + case GUI_BAR_OPTION_FILLING_TOP_BOTTOM: + temp_bar->filling_top_bottom = new_option; + break; + case GUI_BAR_OPTION_FILLING_LEFT_RIGHT: + temp_bar->filling_left_right = new_option; break; case GUI_BAR_OPTION_SIZE: temp_bar->size = new_option; @@ -1170,7 +1210,8 @@ gui_bar_alloc (const char *name) new_bar->type = NULL; new_bar->conditions = NULL; new_bar->position = NULL; - new_bar->filling = NULL; + new_bar->filling_top_bottom = NULL; + new_bar->filling_left_right = NULL; new_bar->size = NULL; new_bar->size_max = NULL; new_bar->color_fg = NULL; @@ -1202,7 +1243,8 @@ gui_bar_new_with_options (struct t_weechat_plugin *plugin, const char *name, struct t_config_option *type, struct t_config_option *conditions, struct t_config_option *position, - struct t_config_option *filling, + struct t_config_option *filling_top_bottom, + struct t_config_option *filling_left_right, struct t_config_option *size, struct t_config_option *size_max, struct t_config_option *color_fg, @@ -1235,7 +1277,8 @@ gui_bar_new_with_options (struct t_weechat_plugin *plugin, const char *name, new_bar->conditions_array = NULL; } new_bar->position = position; - new_bar->filling = filling; + new_bar->filling_top_bottom = filling_top_bottom; + new_bar->filling_left_right = filling_left_right; new_bar->size = size; new_bar->size_max = size_max; new_bar->color_fg = color_fg; @@ -1289,16 +1332,18 @@ struct t_gui_bar * gui_bar_new (struct t_weechat_plugin *plugin, const char *name, const char *hidden, const char *priority, const char *type, const char *conditions, const char *position, - const char *filling, const char *size, const char *size_max, + const char *filling_top_bottom, const char *filling_left_right, + const char *size, const char *size_max, const char *color_fg, const char *color_delim, const char *color_bg, const char *separators, const char *items) { struct t_config_option *option_hidden, *option_priority, *option_type; struct t_config_option *option_conditions, *option_position; - struct t_config_option *option_filling, *option_size; - struct t_config_option *option_size_max, *option_color_fg; - struct t_config_option *option_color_delim, *option_color_bg; - struct t_config_option *option_separator, *option_items; + struct t_config_option *option_filling_top_bottom, *option_filling_left_right; + struct t_config_option *option_size, *option_size_max; + struct t_config_option *option_color_fg, *option_color_delim; + struct t_config_option *option_color_bg, *option_separator; + struct t_config_option *option_items; struct t_gui_bar *new_bar; if (!name || !name[0]) @@ -1326,8 +1371,10 @@ gui_bar_new (struct t_weechat_plugin *plugin, const char *name, conditions); option_position = gui_bar_create_option (name, GUI_BAR_OPTION_POSITION, position); - option_filling = gui_bar_create_option (name, GUI_BAR_OPTION_FILLING, - filling); + option_filling_top_bottom = gui_bar_create_option (name, GUI_BAR_OPTION_FILLING_TOP_BOTTOM, + filling_top_bottom); + option_filling_left_right = gui_bar_create_option (name, GUI_BAR_OPTION_FILLING_LEFT_RIGHT, + filling_left_right); option_size = gui_bar_create_option (name, GUI_BAR_OPTION_SIZE, size); option_size_max = gui_bar_create_option (name, GUI_BAR_OPTION_SIZE_MAX, @@ -1346,10 +1393,12 @@ gui_bar_new (struct t_weechat_plugin *plugin, const char *name, new_bar = gui_bar_new_with_options (plugin, name, option_hidden, option_priority, option_type, option_conditions, option_position, - option_filling, option_size, - option_size_max, option_color_fg, - option_color_delim, option_color_bg, - option_separator, option_items); + option_filling_top_bottom, + option_filling_left_right, + option_size, option_size_max, + option_color_fg, option_color_delim, + option_color_bg, option_separator, + option_items); if (!new_bar) { if (option_hidden) @@ -1362,8 +1411,10 @@ gui_bar_new (struct t_weechat_plugin *plugin, const char *name, config_file_option_free (option_conditions); if (option_position) config_file_option_free (option_position); - if (option_filling) - config_file_option_free (option_filling); + if (option_filling_top_bottom) + config_file_option_free (option_filling_top_bottom); + if (option_filling_left_right) + config_file_option_free (option_filling_left_right); if (option_size) config_file_option_free (option_size); if (option_size_max) @@ -1417,13 +1468,15 @@ gui_bar_use_temp_bars () GUI_BAR_OPTION_POSITION, "top"); - if (!ptr_temp_bar->filling) - ptr_temp_bar->filling = gui_bar_create_option (ptr_temp_bar->name, - GUI_BAR_OPTION_FILLING, - (ptr_temp_bar->position - && ((CONFIG_INTEGER(ptr_temp_bar->position) == GUI_BAR_POSITION_LEFT) - || (CONFIG_INTEGER(ptr_temp_bar->position) == GUI_BAR_POSITION_RIGHT))) ? - "vertical" : "horizontal"); + if (!ptr_temp_bar->filling_top_bottom) + ptr_temp_bar->filling_top_bottom = gui_bar_create_option (ptr_temp_bar->name, + GUI_BAR_OPTION_FILLING_TOP_BOTTOM, + "horizontal"); + + if (!ptr_temp_bar->filling_left_right) + ptr_temp_bar->filling_left_right = gui_bar_create_option (ptr_temp_bar->name, + GUI_BAR_OPTION_FILLING_LEFT_RIGHT, + "vertical"); if (!ptr_temp_bar->size) ptr_temp_bar->size = gui_bar_create_option (ptr_temp_bar->name, @@ -1462,7 +1515,8 @@ gui_bar_use_temp_bars () if (ptr_temp_bar->hidden && ptr_temp_bar->priority && ptr_temp_bar->type && ptr_temp_bar->conditions - && ptr_temp_bar->position && ptr_temp_bar->filling + && ptr_temp_bar->position && ptr_temp_bar->filling_top_bottom + && ptr_temp_bar->filling_left_right && ptr_temp_bar->size && ptr_temp_bar->size_max && ptr_temp_bar->color_fg && ptr_temp_bar->color_delim && ptr_temp_bar->color_bg && ptr_temp_bar->separator @@ -1475,7 +1529,8 @@ gui_bar_use_temp_bars () ptr_temp_bar->type, ptr_temp_bar->conditions, ptr_temp_bar->position, - ptr_temp_bar->filling, + ptr_temp_bar->filling_top_bottom, + ptr_temp_bar->filling_left_right, ptr_temp_bar->size, ptr_temp_bar->size_max, ptr_temp_bar->color_fg, @@ -1511,10 +1566,15 @@ gui_bar_use_temp_bars () config_file_option_free (ptr_temp_bar->position); ptr_temp_bar->position = NULL; } - if (ptr_temp_bar->filling) + if (ptr_temp_bar->filling_top_bottom) { - config_file_option_free (ptr_temp_bar->filling); - ptr_temp_bar->filling = NULL; + config_file_option_free (ptr_temp_bar->filling_top_bottom); + ptr_temp_bar->filling_top_bottom = NULL; + } + if (ptr_temp_bar->filling_left_right) + { + config_file_option_free (ptr_temp_bar->filling_left_right); + ptr_temp_bar->filling_left_right = NULL; } if (ptr_temp_bar->size) { @@ -1625,7 +1685,8 @@ gui_bar_create_default () "window", /* type */ "", /* conditions */ "bottom", /* position */ - "horizontal", /* filling */ + "horizontal", /* filling_top_bottom */ + "vertical", /* filling_left_right */ "1", /* size */ "0", /* size_max */ gui_color_get_name (CONFIG_COLOR(config_color_input)), @@ -1676,7 +1737,8 @@ gui_bar_create_default () "window", /* type */ "", /* conditions */ "bottom", /* position */ - "horizontal", /* filling */ + "horizontal", /* filling_top_bottom */ + "vertical", /* filling_left_right */ "1", /* size */ "0", /* size_max */ gui_color_get_name (CONFIG_COLOR(config_color_status)), @@ -1703,7 +1765,8 @@ gui_bar_create_default () "window", /* type */ "", /* conditions */ "top", /* position */ - "horizontal", /* filling */ + "horizontal", /* filling_top_bottom */ + "vertical" , /* filling_left_right */ "1", /* size */ "0", /* size_max */ gui_color_get_name (CONFIG_COLOR(config_color_title)), @@ -1723,14 +1786,15 @@ gui_bar_create_default () { /* create nicklist bar */ if (gui_bar_new (NULL, GUI_BAR_DEFAULT_NAME_NICKLIST, - "0", /* hidden */ - "200", /* priority */ - "window", /* type */ - "nicklist", /* conditions */ - "right", /* position */ - "vertical", /* filling */ - "0", /* size */ - "0", /* size_max */ + "0", /* hidden */ + "200", /* priority */ + "window", /* type */ + "nicklist", /* conditions */ + "right", /* position */ + "horizontal", /* filling_top_bottom */ + "vertical", /* filling_left_right */ + "0", /* size */ + "0", /* size_max */ gui_color_get_name (CONFIG_COLOR(config_color_nicklist)), gui_color_get_name (CONFIG_COLOR(config_color_nicklist)), gui_color_get_name (CONFIG_COLOR(config_color_nicklist_bg)), @@ -1798,8 +1862,10 @@ gui_bar_free (struct t_gui_bar *bar) config_file_option_free (bar->conditions); if (bar->position) config_file_option_free (bar->position); - if (bar->filling) - config_file_option_free (bar->filling); + if (bar->filling_top_bottom) + config_file_option_free (bar->filling_top_bottom); + if (bar->filling_left_right) + config_file_option_free (bar->filling_left_right); if (bar->size) config_file_option_free (bar->size); if (bar->size_max) @@ -1882,9 +1948,12 @@ gui_bar_print_log () log_printf (" position . . . . . . . : %d (%s)", CONFIG_INTEGER(ptr_bar->position), gui_bar_position_string[CONFIG_INTEGER(ptr_bar->position)]); - log_printf (" filling. . . . . . . . : %d (%s)", - CONFIG_INTEGER(ptr_bar->filling), - gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling)]); + log_printf (" filling_top_bottom . . : %d (%s)", + CONFIG_INTEGER(ptr_bar->filling_top_bottom), + gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling_top_bottom)]); + log_printf (" filling_left_right . . : %d (%s)", + CONFIG_INTEGER(ptr_bar->filling_left_right), + gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling_left_right)]); log_printf (" size . . . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size)); log_printf (" size_max . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size_max)); log_printf (" color_fg . . . . . . . : %d", diff --git a/src/gui/gui-bar.h b/src/gui/gui-bar.h index 7b686bb05..60bc3e71b 100644 --- a/src/gui/gui-bar.h +++ b/src/gui/gui-bar.h @@ -36,7 +36,8 @@ enum t_gui_bar_option GUI_BAR_OPTION_TYPE, GUI_BAR_OPTION_CONDITIONS, GUI_BAR_OPTION_POSITION, - GUI_BAR_OPTION_FILLING, + GUI_BAR_OPTION_FILLING_TOP_BOTTOM, + GUI_BAR_OPTION_FILLING_LEFT_RIGHT, GUI_BAR_OPTION_SIZE, GUI_BAR_OPTION_SIZE_MAX, GUI_BAR_OPTION_COLOR_FG, @@ -84,7 +85,10 @@ struct t_gui_bar struct t_config_option *type; /* type (root or window) */ struct t_config_option *conditions; /* conditions for display */ struct t_config_option *position; /* bottom, top, left, right */ - struct t_config_option *filling; /* filling (H=horizontal,V=vertical)*/ + struct t_config_option *filling_top_bottom; /* filling when position is */ + /* top/bottom (horizontal/vertical) */ + struct t_config_option *filling_left_right; /* filling when position is */ + /* left/right (horizontal/vertical) */ struct t_config_option *size; /* size of bar (in chars, 0 = auto) */ struct t_config_option *size_max; /* max size of bar (0 = no limit) */ struct t_config_option *color_fg; /* default text color for bar */ @@ -120,6 +124,7 @@ extern struct t_gui_bar *last_gui_temp_bar; extern int gui_bar_search_option (const char *option_name); extern int gui_bar_search_type (const char *type); extern int gui_bar_search_position (const char *position); +extern struct t_config_option *gui_bar_get_option_filling (struct t_gui_bar *bar); extern int gui_bar_check_conditions_for_window (struct t_gui_bar *bar, struct t_gui_window *window); extern int gui_bar_root_get_size (struct t_gui_bar *bar, @@ -131,11 +136,15 @@ extern void gui_bar_create_option_temp (struct t_gui_bar *temp_bar, int index_option, const char *value); extern struct t_gui_bar *gui_bar_alloc (const char *name); extern struct t_gui_bar *gui_bar_new (struct t_weechat_plugin *plugin, - const char *name, const char *hidden, - const char *priority, const char *type, + const char *name, + const char *hidden, + const char *priority, + const char *type, const char *conditions, const char *position, - const char *filling, const char *size, + const char *filling_top_bottom, + const char *filling_left_right, + const char *size, const char *size_max, const char *color_fg, const char *color_delim, diff --git a/src/plugins/scripts/lua/weechat-lua-api.c b/src/plugins/scripts/lua/weechat-lua-api.c index 2bce09a6d..2b1f2c65a 100644 --- a/src/plugins/scripts/lua/weechat-lua-api.c +++ b/src/plugins/scripts/lua/weechat-lua-api.c @@ -4038,8 +4038,8 @@ static int weechat_lua_api_bar_new (lua_State *L) { const char *name, *hidden, *priority, *type, *conditions, *position; - const char *filling, *size, *size_max, *color_fg, *color_delim, *color_bg; - const char *separator, *items; + const char *filling_top_bottom, *filling_left_right, *size, *size_max; + const char *color_fg, *color_delim, *color_bg, *separator, *items; char *result; int n; @@ -4058,7 +4058,8 @@ weechat_lua_api_bar_new (lua_State *L) type = NULL; conditions = NULL; position = NULL; - filling = NULL; + filling_top_bottom = NULL; + filling_left_right = NULL; size = NULL; size_max = NULL; color_fg = NULL; @@ -4069,19 +4070,20 @@ weechat_lua_api_bar_new (lua_State *L) n = lua_gettop (lua_current_interpreter); - if (n < 14) + if (n < 15) { WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new"); LUA_RETURN_EMPTY; } - name = lua_tostring (lua_current_interpreter, -14); - hidden = lua_tostring (lua_current_interpreter, -13); - priority = lua_tostring (lua_current_interpreter, -12); - type = lua_tostring (lua_current_interpreter, -11); - conditions = lua_tostring (lua_current_interpreter, -10); - position = lua_tostring (lua_current_interpreter, -9); - filling = lua_tostring (lua_current_interpreter, -8); + name = lua_tostring (lua_current_interpreter, -15); + hidden = lua_tostring (lua_current_interpreter, -14); + priority = lua_tostring (lua_current_interpreter, -13); + type = lua_tostring (lua_current_interpreter, -12); + conditions = lua_tostring (lua_current_interpreter, -11); + position = lua_tostring (lua_current_interpreter, -10); + filling_top_bottom = lua_tostring (lua_current_interpreter, -9); + filling_left_right = lua_tostring (lua_current_interpreter, -8); size = lua_tostring (lua_current_interpreter, -7); size_max = lua_tostring (lua_current_interpreter, -6); color_fg = lua_tostring (lua_current_interpreter, -5); @@ -4096,7 +4098,8 @@ weechat_lua_api_bar_new (lua_State *L) type, conditions, position, - filling, + filling_top_bottom, + filling_left_right, size, size_max, color_fg, diff --git a/src/plugins/scripts/perl/weechat-perl-api.c b/src/plugins/scripts/perl/weechat-perl-api.c index aa0a6e0b6..bcee5ce30 100644 --- a/src/plugins/scripts/perl/weechat-perl-api.c +++ b/src/plugins/scripts/perl/weechat-perl-api.c @@ -3354,8 +3354,8 @@ static XS (XS_weechat_bar_search) static XS (XS_weechat_bar_new) { char *result, *name, *hidden, *priority, *type, *conditions, *position; - char *filling, *size, *size_max, *color_fg, *color_delim, *color_bg; - char *separator, *bar_items; + char *filling_top_bottom, *filling_left_right, *size, *size_max, *color_fg; + char *color_delim, *color_bg, *separator, *bar_items; dXSARGS; /* make C compiler happy */ @@ -3367,7 +3367,7 @@ static XS (XS_weechat_bar_new) PERL_RETURN_EMPTY; } - if (items < 14) + if (items < 15) { WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new"); PERL_RETURN_EMPTY; @@ -3379,21 +3379,23 @@ static XS (XS_weechat_bar_new) type = SvPV (ST (3), PL_na); conditions = SvPV (ST (4), PL_na); position = SvPV (ST (5), PL_na); - filling = SvPV (ST (6), PL_na); - size = SvPV (ST (7), PL_na); - size_max = SvPV (ST (8), PL_na); - color_fg = SvPV (ST (9), PL_na); - color_delim = SvPV (ST (10), PL_na); - color_bg = SvPV (ST (11), PL_na); - separator = SvPV (ST (12), PL_na); - bar_items = SvPV (ST (13), PL_na); + filling_top_bottom = SvPV (ST (6), PL_na); + filling_left_right = SvPV (ST (7), PL_na); + size = SvPV (ST (8), PL_na); + size_max = SvPV (ST (9), PL_na); + color_fg = SvPV (ST (10), PL_na); + color_delim = SvPV (ST (11), PL_na); + color_bg = SvPV (ST (12), PL_na); + separator = SvPV (ST (13), PL_na); + bar_items = SvPV (ST (14), PL_na); result = script_ptr2str (weechat_bar_new (name, hidden, priority, type, conditions, position, - filling, + filling_top_bottom, + filling_left_right, size, size_max, color_fg, diff --git a/src/plugins/scripts/python/weechat-python-api.c b/src/plugins/scripts/python/weechat-python-api.c index acff1681e..755e16300 100644 --- a/src/plugins/scripts/python/weechat-python-api.c +++ b/src/plugins/scripts/python/weechat-python-api.c @@ -3565,9 +3565,9 @@ weechat_python_api_bar_search (PyObject *self, PyObject *args) static PyObject * weechat_python_api_bar_new (PyObject *self, PyObject *args) { - char *name, *hidden, *priority, *type, *conditions, *position, *filling; - char *size, *size_max, *color_fg, *color_delim, *color_bg, *separator; - char *items, *result; + char *name, *hidden, *priority, *type, *conditions, *position; + char *filling_top_bottom, *filling_left_right, *size, *size_max; + char *color_fg, *color_delim, *color_bg, *separator, *items, *result; PyObject *object; /* make C compiler happy */ @@ -3585,7 +3585,8 @@ weechat_python_api_bar_new (PyObject *self, PyObject *args) type = NULL; conditions = NULL; position = NULL; - filling = NULL; + filling_top_bottom = NULL; + filling_left_right = NULL; size = NULL; size_max = NULL; color_fg = NULL; @@ -3594,10 +3595,10 @@ weechat_python_api_bar_new (PyObject *self, PyObject *args) separator = NULL; items = NULL; - if (!PyArg_ParseTuple (args, "ssssssssssssss", &name, &hidden, &priority, - &conditions, &type, &position, &filling, &size, - &size_max, &color_fg, &color_delim, &color_bg, - &separator, &items)) + if (!PyArg_ParseTuple (args, "sssssssssssssss", &name, &hidden, &priority, + &conditions, &type, &position, &filling_top_bottom, + &filling_left_right, &size, &size_max, &color_fg, + &color_delim, &color_bg, &separator, &items)) { WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new"); PYTHON_RETURN_EMPTY; @@ -3609,7 +3610,8 @@ weechat_python_api_bar_new (PyObject *self, PyObject *args) type, conditions, position, - filling, + filling_top_bottom, + filling_left_right, size, size_max, color_fg, diff --git a/src/plugins/scripts/ruby/weechat-ruby-api.c b/src/plugins/scripts/ruby/weechat-ruby-api.c index 72d61b803..c41010fd6 100644 --- a/src/plugins/scripts/ruby/weechat-ruby-api.c +++ b/src/plugins/scripts/ruby/weechat-ruby-api.c @@ -4095,13 +4095,14 @@ weechat_ruby_api_bar_search (VALUE class, VALUE name) static VALUE weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, VALUE priority, VALUE type, VALUE conditions, - VALUE position, VALUE filling, VALUE size, + VALUE position, VALUE filling_top_bottom, + VALUE filling_left_right, VALUE size, VALUE size_max, VALUE color_fg, VALUE color_delim, VALUE color_bg, VALUE separator, VALUE items) { char *c_name, *c_hidden, *c_priority, *c_type, *c_conditions, *c_position; - char *c_filling, *c_size, *c_size_max, *c_color_fg, *c_color_delim; - char *c_color_bg, *c_separator, *c_items; + char *c_filling_top_bottom, *c_filling_left_right, *c_size, *c_size_max; + char *c_color_fg, *c_color_delim, *c_color_bg, *c_separator, *c_items; char *result; VALUE return_value; @@ -4120,7 +4121,8 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, c_type = NULL; c_conditions = NULL; c_position = NULL; - c_filling = NULL; + c_filling_top_bottom = NULL; + c_filling_left_right = NULL; c_size = NULL; c_size_max = NULL; c_color_fg = NULL; @@ -4130,10 +4132,10 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, c_items = NULL; if (NIL_P (name) || NIL_P (hidden) || NIL_P (priority) || NIL_P (type) - || NIL_P (conditions) || NIL_P (position) || NIL_P (filling) - || NIL_P (size) || NIL_P (size_max) || NIL_P (color_fg) - || NIL_P (color_delim) || NIL_P (color_bg) || NIL_P (separator) - || NIL_P (items)) + || NIL_P (conditions) || NIL_P (position) || NIL_P (filling_top_bottom) + || NIL_P (filling_left_right) || NIL_P (size) || NIL_P (size_max) + || NIL_P (color_fg) || NIL_P (color_delim) || NIL_P (color_bg) + || NIL_P (separator) || NIL_P (items)) { WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new"); RUBY_RETURN_EMPTY; @@ -4145,7 +4147,8 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, Check_Type (type, T_STRING); Check_Type (conditions, T_STRING); Check_Type (position, T_STRING); - Check_Type (filling, T_STRING); + Check_Type (filling_top_bottom, T_STRING); + Check_Type (filling_left_right, T_STRING); Check_Type (size, T_STRING); Check_Type (size_max, T_STRING); Check_Type (color_fg, T_STRING); @@ -4160,7 +4163,8 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, c_type = STR2CSTR (type); c_conditions = STR2CSTR (conditions); c_position = STR2CSTR (position); - c_filling = STR2CSTR (filling); + c_filling_top_bottom = STR2CSTR (filling_top_bottom); + c_filling_left_right = STR2CSTR (filling_left_right); c_size = STR2CSTR (size); c_size_max = STR2CSTR (size_max); c_color_fg = STR2CSTR (color_fg); @@ -4175,7 +4179,8 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE hidden, c_type, c_conditions, c_position, - c_filling, + c_filling_top_bottom, + c_filling_left_right, c_size, c_size_max, c_color_fg, @@ -4803,7 +4808,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) rb_define_module_function (ruby_mWeechat, "bar_item_update", &weechat_ruby_api_bar_item_update, 1); rb_define_module_function (ruby_mWeechat, "bar_item_remove", &weechat_ruby_api_bar_item_remove, 1); rb_define_module_function (ruby_mWeechat, "bar_search", &weechat_ruby_api_bar_search, 1); - rb_define_module_function (ruby_mWeechat, "bar_new", &weechat_ruby_api_bar_new, 14); + rb_define_module_function (ruby_mWeechat, "bar_new", &weechat_ruby_api_bar_new, 15); rb_define_module_function (ruby_mWeechat, "bar_set", &weechat_ruby_api_bar_set, 3); rb_define_module_function (ruby_mWeechat, "bar_update", &weechat_ruby_api_bar_update, 1); rb_define_module_function (ruby_mWeechat, "bar_remove", &weechat_ruby_api_bar_remove, 1); diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h index 149affa1b..e88fedd3b 100644 --- a/src/plugins/weechat-plugin.h +++ b/src/plugins/weechat-plugin.h @@ -429,7 +429,8 @@ struct t_weechat_plugin const char *type, const char *condition, const char *position, - const char *filling, + const char *filling_top_bottom, + const char *filling_left_right, const char *size, const char *size_max, const char *color_fg, @@ -862,13 +863,14 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin); #define weechat_bar_search(__name) \ weechat_plugin->bar_search(__name) #define weechat_bar_new(__name, __hidden, __priority, __type, \ - __condition, __position, __filling, __size, \ - __size_max, __color_fg, __color_delim, \ - __color_bg, \ + __condition, __position, __filling_top_bottom, \ + __filling_left_right, __size, __size_max, \ + __color_fg, __color_delim, __color_bg, \ __separator, __items) \ weechat_plugin->bar_new(weechat_plugin, __name, __hidden, \ __priority, __type, __condition, \ - __position, __filling, __size, __size_max, \ + __position, __filling_top_bottom, \ + __filling_left_right, __size, __size_max, \ __color_fg, __color_delim, __color_bg, \ __separator, __items) #define weechat_bar_set(__bar, __property, __value) \