buflist: add two new bar items using the same format configuration options (closes #990)

src/plugins/buflist/buflist-bar-item.c

@@ -29,31 +29,81 @@
 #include "buflist-config.h"
 
 
-struct t_gui_bar_item *buflist_bar_item_buflist = NULL;
+struct t_gui_bar_item *buflist_bar_item_buflist[BUFLIST_BAR_NUM_ITEMS];
 struct t_hashtable *buflist_hashtable_pointers = NULL;
 struct t_hashtable *buflist_hashtable_extra_vars = NULL;
 struct t_hashtable *buflist_hashtable_options_conditions = NULL;
-struct t_arraylist *buflist_list_buffers = NULL;
+struct t_arraylist *buflist_list_buffers[BUFLIST_BAR_NUM_ITEMS];
 
-int old_line_number_current_buffer = -1;
+int old_line_number_current_buffer[BUFLIST_BAR_NUM_ITEMS];
 
 
 /*
- * Updates buflist bar item if buflist is enabled.
+ * Returns the bar item name with an index.
+ */
+
+const char *
+buflist_bar_item_get_name (int index)
+{
+    static char item_name[16];
+
+    if (index == 0)
+    {
+        snprintf (item_name, sizeof (item_name), "%s", BUFLIST_BAR_ITEM_NAME);
+    }
+    else
+    {
+        snprintf (item_name, sizeof (item_name),
+                  "%s%d",
+                  BUFLIST_BAR_ITEM_NAME,
+                  index + 1);
+    }
+    return item_name;
+}
+
+/*
+ * Returns the bar item index with an item name, -1 if not found.
+ */
+
+int
+buflist_bar_item_get_index (const char *item_name)
+{
+    int i;
+    const char *ptr_item_name;
+
+    for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+    {
+        ptr_item_name = buflist_bar_item_get_name (i);
+        if (strcmp (ptr_item_name, item_name) == 0)
+            return i;
+    }
+
+    return -1;
+}
+
+/*
+ * Updates buflist bar item if buflist is enabled (or if force argument is 1).
  */
 
 void
-buflist_bar_item_update ()
+buflist_bar_item_update (int force)
 {
-    if (weechat_config_boolean (buflist_config_look_enabled))
-        weechat_bar_item_update (BUFLIST_BAR_ITEM_NAME);
+    int i;
+
+    if (force || weechat_config_boolean (buflist_config_look_enabled))
+    {
+        for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+        {
+            weechat_bar_item_update (buflist_bar_item_get_name (i));
+        }
+    }
 }
 
 /*
  * Checks if the bar can be scrolled, the bar must have:
  * - a position "left" or "right"
  * - a filling "vertical"
- * - "buflist" as first item.
+ * - the item_name as first item.
  *
  * Returns:
  *   1: bar can be scrolled
@@ -61,7 +111,7 @@ buflist_bar_item_update ()
  */
 
 int
-buflist_bar_item_bar_can_scroll (struct t_gui_bar *bar)
+buflist_bar_item_bar_can_scroll (struct t_gui_bar *bar, const char *item_name)
 {
     const char *ptr_bar_name, *ptr_bar_position, *ptr_bar_filling;
     int items_count, *items_subcount;
@@ -104,7 +154,7 @@ buflist_bar_item_bar_can_scroll (struct t_gui_bar *bar)
         return 0;
     items_name = weechat_hdata_pointer (buflist_hdata_bar, bar, "items_name");
     if (!items_name || !items_name[0] || !items_name[0][0]
-        || (strcmp (items_name[0][0], BUFLIST_BAR_ITEM_NAME) != 0))
+        || (strcmp (items_name[0][0], item_name) != 0))
     {
         return 0;
     }
@@ -156,11 +206,11 @@ buflist_bar_item_auto_scroll_bar_window (struct t_gui_bar_window *bar_window,
 }
 
 /*
- * Auto-scrolls all bars with buflist item as first item.
+ * Auto-scrolls all bars with a given buflist item as first item.
  */
 
 void
-buflist_bar_item_auto_scroll (int line_number)
+buflist_bar_item_auto_scroll (const char *item_name, int line_number)
 {
     struct t_gui_bar *ptr_bar;
     struct t_gui_bar_window *ptr_bar_window;
@@ -175,7 +225,8 @@ buflist_bar_item_auto_scroll (int line_number)
     {
         ptr_bar_window = weechat_hdata_pointer (buflist_hdata_bar, ptr_bar,
                                                 "bar_window");
-        if (ptr_bar_window && buflist_bar_item_bar_can_scroll (ptr_bar))
+        if (ptr_bar_window && buflist_bar_item_bar_can_scroll (ptr_bar,
+                                                               item_name))
         {
             buflist_bar_item_auto_scroll_bar_window (ptr_bar_window,
                                                      line_number);
@@ -193,7 +244,7 @@ buflist_bar_item_auto_scroll (int line_number)
         {
             ptr_bar = weechat_hdata_pointer (buflist_hdata_bar_window,
                                              ptr_bar_window, "bar");
-            if (buflist_bar_item_bar_can_scroll (ptr_bar))
+            if (buflist_bar_item_bar_can_scroll (ptr_bar, item_name))
             {
                 buflist_bar_item_auto_scroll_bar_window (ptr_bar_window,
                                                          line_number);
@@ -234,15 +285,13 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
     const char *hotlist_priority[4] = { "low", "message", "private",
                                         "highlight" };
     const char indent_empty[1] = { '\0' };
-    const char *ptr_lag;
-    int num_buffers, is_channel, is_private;
+    const char *ptr_lag, *ptr_item_name;
+    int item_index, num_buffers, is_channel, is_private;
     int i, j, length_max_number, current_buffer, number, prev_number, priority;
     int rc, count, line_number, line_number_current_buffer;
 
     /* make C compiler happy */
-    (void) pointer;
     (void) data;
-    (void) item;
     (void) window;
     (void) buffer;
     (void) extra_info;
@@ -256,6 +305,10 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
 
     buflist = weechat_string_dyn_alloc (256);
 
+    item_index = (int)((unsigned long)pointer);
+
+    weechat_hashtable_set (buflist_hashtable_pointers, "bar_item", item);
+
     ptr_format = buflist_config_format_buffer_eval;
     ptr_format_current = buflist_config_format_buffer_current_eval;
 
@@ -273,10 +326,11 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
     snprintf (str_format_number_empty, sizeof (str_format_number_empty),
               "%%-%ds", length_max_number);
 
-    if (buflist_list_buffers)
-        weechat_arraylist_free (buflist_list_buffers);
-    buflist_list_buffers = weechat_arraylist_new (16, 0, 1,
-                                                  NULL, NULL, NULL, NULL);
+    if (buflist_list_buffers[item_index])
+        weechat_arraylist_free (buflist_list_buffers[item_index]);
+    buflist_list_buffers[item_index] = weechat_arraylist_new (
+        16, 0, 1,
+        NULL, NULL, NULL, NULL);
 
     buffers = buflist_sort_buffers ();
 
@@ -308,7 +362,7 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
         if (!rc)
             continue;
 
-        weechat_arraylist_add (buflist_list_buffers, ptr_buffer);
+        weechat_arraylist_add (buflist_list_buffers[item_index], ptr_buffer);
 
         current_buffer = (ptr_buffer == ptr_current_buffer);
 
@@ -555,12 +609,15 @@ end:
     weechat_string_dyn_free (buflist, 0);
     weechat_arraylist_free (buffers);
 
-    if ((line_number_current_buffer != old_line_number_current_buffer)
+    if ((line_number_current_buffer != old_line_number_current_buffer[item_index])
         && (weechat_config_integer (buflist_config_look_auto_scroll) >= 0))
     {
-        buflist_bar_item_auto_scroll (line_number_current_buffer);
+        ptr_item_name = weechat_hdata_string (buflist_hdata_bar_item,
+                                              item, "name");
+        buflist_bar_item_auto_scroll (ptr_item_name,
+                                      line_number_current_buffer);
     }
-    old_line_number_current_buffer = line_number_current_buffer;
+    old_line_number_current_buffer[item_index] = line_number_current_buffer;
 
     return str_buflist;
 }
@@ -576,6 +633,8 @@ end:
 int
 buflist_bar_item_init ()
 {
+    int i;
+
     /* create hashtables used by the bar item callback */
     buflist_hashtable_pointers = weechat_hashtable_new (
         32,
@@ -613,9 +672,15 @@ buflist_bar_item_init ()
                            "type", "condition");
 
     /* bar items */
-    buflist_bar_item_buflist = weechat_bar_item_new (
-        BUFLIST_BAR_ITEM_NAME,
-        &buflist_bar_item_buflist_cb, NULL, NULL);
+    for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+    {
+        buflist_list_buffers[i] = NULL;
+        old_line_number_current_buffer[i] = -1;
+        buflist_bar_item_buflist[i] = weechat_bar_item_new (
+            buflist_bar_item_get_name (i),
+            &buflist_bar_item_buflist_cb,
+            (const void *)((long unsigned)i), NULL);
+    }
 
     return 1;
 }
@@ -627,7 +692,12 @@ buflist_bar_item_init ()
 void
 buflist_bar_item_end ()
 {
-    weechat_bar_item_remove (buflist_bar_item_buflist);
+    int i;
+
+    for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+    {
+        weechat_bar_item_remove (buflist_bar_item_buflist[i]);
+    }
 
     weechat_hashtable_free (buflist_hashtable_pointers);
     buflist_hashtable_pointers = NULL;
@@ -638,9 +708,12 @@ buflist_bar_item_end ()
     weechat_hashtable_free (buflist_hashtable_options_conditions);
     buflist_hashtable_options_conditions = NULL;
 
-    if (buflist_list_buffers)
+    for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
     {
-        weechat_arraylist_free (buflist_list_buffers);
-        buflist_list_buffers = NULL;
+        if (buflist_list_buffers[i])
+        {
+            weechat_arraylist_free (buflist_list_buffers[i]);
+            buflist_list_buffers[i] = NULL;
+        }
     }
 }

src/plugins/buflist/buflist-bar-item.h

@@ -22,9 +22,13 @@
 
 #define BUFLIST_BAR_ITEM_NAME "buflist"
 
-extern struct t_arraylist *buflist_list_buffers;
+#define BUFLIST_BAR_NUM_ITEMS 3
 
-extern void buflist_bar_item_update ();
+extern struct t_arraylist *buflist_list_buffers[BUFLIST_BAR_NUM_ITEMS];
+
+extern const char *buflist_bar_item_get_name (int index);
+extern int buflist_bar_item_get_index (const char *item_name);
+extern void buflist_bar_item_update (int force);
 extern int buflist_bar_item_init ();
 extern void buflist_bar_item_end ();
 

src/plugins/buflist/buflist-command.c

@@ -53,7 +53,7 @@ buflist_command_buflist (const void *pointer, void *data,
 
     if (weechat_strcasecmp (argv[1], "refresh") == 0)
     {
-        buflist_bar_item_update ();
+        buflist_bar_item_update (0);
         return WEECHAT_RC_OK;
     }
 
@@ -72,7 +72,8 @@ buflist_command_init ()
         N_("bar item with list of buffers"),
         "bar || refresh",
         N_("    bar: add the \"buflist\" bar\n"
-           "refresh: force the refresh of the \"buflist\" bar item\n"
+           "refresh: force the refresh of the bar items (buflist, buflist2 "
+           "and buflist3)\n"
            "\n"
            "The lines with buffers are displayed using string evaluation "
            "(see /help eval for the format), with these options:\n"
@@ -83,6 +84,9 @@ buflist_command_init ()
            "  - buflist.format.buffer_current: format for the current buffer\n"
            "\n"
            "The following variables can be used in these options:\n"
+           "  - bar item data (see hdata \"bar_item\" in API doc for a complete "
+           "list), for example:\n"
+           "    - ${bar_item.name}\n"
            "  - buffer data (see hdata \"buffer\" in API doc for a complete "
            "list), for example:\n"
            "    - ${buffer.number}\n"

src/plugins/buflist/buflist-config.c

@@ -127,7 +127,7 @@ buflist_config_signal_buffer_cb (const void *pointer, void *data,
     (void) type_data;
     (void) signal_data;
 
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 
     return WEECHAT_RC_OK;
 }
@@ -228,13 +228,13 @@ buflist_config_change_enabled (const void *pointer, void *data,
         /* buflist enabled */
         buflist_config_hook_signals_refresh ();
         weechat_command (NULL, "/mute /bar show buflist");
-        buflist_bar_item_update ();
+        buflist_bar_item_update (0);
     }
     else
     {
         /* buflist disabled */
         weechat_command (NULL, "/mute /bar hide buflist");
-        weechat_bar_item_update (BUFLIST_BAR_ITEM_NAME);
+        buflist_bar_item_update (1);
     }
 }
 
@@ -258,7 +258,7 @@ buflist_config_change_sort (const void *pointer, void *data,
         weechat_config_string (buflist_config_look_sort),
         ",", 0, 0, &buflist_config_sort_fields_count);
 
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 }
 
 /*
@@ -292,7 +292,7 @@ buflist_config_change_nick_prefix (const void *pointer, void *data,
     (void) option;
 
     buflist_config_change_signals_refresh (NULL, NULL, NULL);
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 }
 
 /*
@@ -308,7 +308,7 @@ buflist_config_change_buflist (const void *pointer, void *data,
     (void) data;
     (void) option;
 
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 }
 
 /*
@@ -369,7 +369,7 @@ buflist_config_change_format (const void *pointer, void *data,
     buflist_config_format_hotlist_eval = buflist_config_add_eval_for_formats (
         weechat_config_string (buflist_config_format_hotlist));
 
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 }
 
 /*

src/plugins/buflist/buflist-mouse.c

@@ -40,7 +40,7 @@ buflist_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
     const char *ptr_bar_item_name, *ptr_bar_item_line, *keys, *ptr_value;
     long item_line;
     char *error, str_value[128], **list_keys;
-    int i, num_keys, type;
+    int i, item_index, num_keys, type;
     struct t_gui_buffer *ptr_buffer;
 
     /* make C compiler happy */
@@ -49,12 +49,13 @@ buflist_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
 
     ptr_buffer = NULL;
 
-    if (!buflist_list_buffers)
-        goto end;
-
     /* check bar item name */
     ptr_bar_item_name = weechat_hashtable_get (info, "_bar_item_name");
-    if (strcmp (ptr_bar_item_name, BUFLIST_BAR_ITEM_NAME) != 0)
+    item_index = buflist_bar_item_get_index (ptr_bar_item_name);
+    if (item_index < 0)
+        goto end;
+
+    if (!buflist_list_buffers[item_index])
         goto end;
 
     /* check bar item line */
@@ -65,13 +66,14 @@ buflist_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
     if (!error || error[0])
         goto end;
     if ((item_line < 0)
-        || (item_line >= weechat_arraylist_size (buflist_list_buffers)))
+        || (item_line >= weechat_arraylist_size (buflist_list_buffers[item_index])))
     {
         goto end;
     }
 
     /* check if buffer pointer is still valid */
-    ptr_buffer = weechat_arraylist_get (buflist_list_buffers, item_line);
+    ptr_buffer = weechat_arraylist_get (buflist_list_buffers[item_index],
+                                        item_line);
     if (!ptr_buffer)
         goto end;
     if (!weechat_hdata_check_pointer (
@@ -321,7 +323,13 @@ buflist_hsignal_cb (const void *pointer, void *data, const char *signal,
 int
 buflist_mouse_init ()
 {
-    weechat_hook_focus (BUFLIST_BAR_ITEM_NAME, &buflist_focus_cb, NULL, NULL);
+    int i;
+
+    for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+    {
+        weechat_hook_focus (buflist_bar_item_get_name (i),
+                            &buflist_focus_cb, NULL, NULL);
+    }
 
     weechat_hook_hsignal(BUFLIST_MOUSE_HSIGNAL,
                          &buflist_hsignal_cb, NULL, NULL);

src/plugins/buflist/buflist.c

@@ -44,6 +44,7 @@ struct t_hdata *buflist_hdata_window = NULL;
 struct t_hdata *buflist_hdata_buffer = NULL;
 struct t_hdata *buflist_hdata_hotlist = NULL;
 struct t_hdata *buflist_hdata_bar = NULL;
+struct t_hdata *buflist_hdata_bar_item = NULL;
 struct t_hdata *buflist_hdata_bar_window = NULL;
 
 
@@ -403,6 +404,8 @@ int
 weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
 {
     struct t_hashtable *keys;
+    char str_key[256];
+    int i;
 
     /* make C compiler happy */
     (void) argc;
@@ -414,6 +417,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     buflist_hdata_buffer = weechat_hdata_get ("buffer");
     buflist_hdata_hotlist = weechat_hdata_get ("hotlist");
     buflist_hdata_bar = weechat_hdata_get ("bar");
+    buflist_hdata_bar_item = weechat_hdata_get ("bar_item");
     buflist_hdata_bar_window = weechat_hdata_get ("bar_window");
 
     if (!buflist_config_init ())
@@ -429,7 +433,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     if (weechat_config_boolean (buflist_config_look_enabled))
         buflist_add_bar ();
 
-    buflist_bar_item_update ();
+    buflist_bar_item_update (0);
 
     buflist_mouse_init ();
 
@@ -453,12 +457,19 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
 
         /* default mouse actions */
         weechat_hashtable_remove_all (keys);
-        weechat_hashtable_set (keys,
-                               "@item(" BUFLIST_BAR_ITEM_NAME "):button1*",
-                               "hsignal:" BUFLIST_MOUSE_HSIGNAL);
-        weechat_hashtable_set (keys,
-                               "@item(" BUFLIST_BAR_ITEM_NAME "):button2*",
-                               "hsignal:" BUFLIST_MOUSE_HSIGNAL);
+        for (i = 0; i < BUFLIST_BAR_NUM_ITEMS; i++)
+        {
+            snprintf (str_key, sizeof (str_key),
+                      "@item(%s):button1*",
+                      buflist_bar_item_get_name (i));
+            weechat_hashtable_set (keys,
+                                   str_key, "hsignal:" BUFLIST_MOUSE_HSIGNAL);
+            snprintf (str_key, sizeof (str_key),
+                      "@item(%s):button2*",
+                      buflist_bar_item_get_name (i));
+            weechat_hashtable_set (keys,
+                                   str_key, "hsignal:" BUFLIST_MOUSE_HSIGNAL);
+        }
         weechat_hashtable_set (keys,
                                "@bar(" BUFLIST_BAR_NAME "):ctrl-wheelup",
                                "hsignal:" BUFLIST_MOUSE_HSIGNAL);

src/plugins/buflist/buflist.h

@@ -31,6 +31,7 @@ extern struct t_hdata *buflist_hdata_window;
 extern struct t_hdata *buflist_hdata_buffer;
 extern struct t_hdata *buflist_hdata_hotlist;
 extern struct t_hdata *buflist_hdata_bar;
+extern struct t_hdata *buflist_hdata_bar_item;
 extern struct t_hdata *buflist_hdata_bar_window;
 
 extern void buflist_add_bar ();