buflist: add option buflist.look.display_conditions

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

@@ -33,6 +33,7 @@ struct t_gui_bar_item *buflist_bar_item_buflist = NULL;
 struct t_hashtable *buflist_hashtable_pointers = NULL;
 struct t_hashtable *buflist_hashtable_extra_vars = NULL;
 struct t_hashtable *buflist_hashtable_options = NULL;
+struct t_hashtable *buflist_hashtable_options_conditions = NULL;
 
 
 /*
@@ -49,7 +50,7 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
     struct t_arraylist *buffers;
     struct t_gui_buffer *ptr_buffer, *ptr_current_buffer;
     struct t_gui_hotlist *ptr_hotlist;
-    char **buflist, *str_buflist;
+    char **buflist, *str_buflist, *condition;
     char str_format_number[32], str_format_number_empty[32];
     char str_number[32], str_indent_name[4], *line, **hotlist, *str_hotlist;
     char str_hotlist_count[32];
@@ -97,6 +98,22 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
     {
         ptr_buffer = weechat_arraylist_get (buffers, i);
 
+        /* set pointers */
+        weechat_hashtable_set (buflist_hashtable_pointers,
+                               "buffer", ptr_buffer);
+
+        /* check condition: if false, the buffer is not displayed */
+        condition = weechat_string_eval_expression (
+            weechat_config_string (buflist_config_look_display_conditions),
+            buflist_hashtable_pointers,
+            NULL,  /* extra vars */
+            buflist_hashtable_options_conditions);
+        rc = (condition && (strcmp (condition, "1") == 0));
+        if (condition)
+            free (condition);
+        if (!rc)
+            continue;
+
         current_buffer = (ptr_buffer == ptr_current_buffer);
 
         ptr_hotlist = weechat_hdata_pointer (buflist_hdata_buffer,
@@ -139,10 +156,6 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
             snprintf (str_indent_name, sizeof (str_indent_name), "  ");
         }
 
-        /* set pointers */
-        weechat_hashtable_set (buflist_hashtable_pointers,
-                               "buffer", ptr_buffer);
-
         /* set extra variables */
         weechat_hashtable_set (buflist_hashtable_extra_vars,
                                "format_buffer",
@@ -273,7 +286,7 @@ end:
 int
 buflist_bar_item_init ()
 {
-    /* create hashtable used by the bar item callback */
+    /* create hashtables used by the bar item callback */
     buflist_hashtable_pointers = weechat_hashtable_new (
         8,
         WEECHAT_HASHTABLE_STRING,
@@ -282,6 +295,7 @@ buflist_bar_item_init ()
         NULL);
     if (!buflist_hashtable_pointers)
         return 0;
+
     buflist_hashtable_extra_vars = weechat_hashtable_new (
         32,
         WEECHAT_HASHTABLE_STRING,
@@ -293,6 +307,7 @@ buflist_bar_item_init ()
         weechat_hashtable_free (buflist_hashtable_pointers);
         return 0;
     }
+
     buflist_hashtable_options = weechat_hashtable_new (
         8,
         WEECHAT_HASHTABLE_STRING,
@@ -307,6 +322,21 @@ buflist_bar_item_init ()
     }
     weechat_hashtable_set (buflist_hashtable_options, "extra", "eval");
 
+    buflist_hashtable_options_conditions = weechat_hashtable_new (
+        8,
+        WEECHAT_HASHTABLE_STRING,
+        WEECHAT_HASHTABLE_STRING,
+        NULL, NULL);
+    if (!buflist_hashtable_options_conditions)
+    {
+        weechat_hashtable_free (buflist_hashtable_pointers);
+        weechat_hashtable_free (buflist_hashtable_extra_vars);
+        weechat_hashtable_free (buflist_hashtable_options);
+        return 0;
+    }
+    weechat_hashtable_set (buflist_hashtable_options_conditions,
+                           "type", "condition");
+
     /* bar items */
     buflist_bar_item_buflist = weechat_bar_item_new (
         BUFLIST_BAR_ITEM_NAME,
@@ -332,4 +362,7 @@ buflist_bar_item_end ()
 
     weechat_hashtable_free (buflist_hashtable_options);
     buflist_hashtable_options = NULL;
+
+    weechat_hashtable_free (buflist_hashtable_options_conditions);
+    buflist_hashtable_options_conditions = NULL;
 }

src/plugins/buflist/buflist-command.c

@@ -73,7 +73,9 @@ buflist_command_init ()
         N_("refresh: force the refresh of the \"buflist\" bar item\n"
            "\n"
            "The lines with buffers are displayed using string evaluation "
-           "(see /help eval for the format), with two main options:\n"
+           "(see /help eval for the format), with these options:\n"
+           "  - buflist.look.display_conditions: conditions to display a "
+           "buffer in the list\n"
            "  - buflist.format.buffer: format for a buffer which is not "
            "current buffer\n"
            "  - buflist.format.buffer_current: format for the current buffer\n"

src/plugins/buflist/buflist-config.c

@@ -31,6 +31,7 @@ struct t_config_file *buflist_config_file = NULL;
 
 /* buflist config, look section */
 
+struct t_config_option *buflist_config_look_display_conditions;
 struct t_config_option *buflist_config_look_signals_refresh;
 struct t_config_option *buflist_config_look_sort;
 
@@ -205,17 +206,16 @@ buflist_config_init ()
         return 0;
     }
 
-    buflist_config_look_sort = weechat_config_new_option (
+    buflist_config_look_display_conditions = weechat_config_new_option (
         buflist_config_file, ptr_section,
-        "sort", "string",
-        N_("comma-separated list of fields to sort buffers; each field is "
-           "a hdata variable of buffer; char \"-\" can be used before field "
-           "to reverse order"),
+        "display_conditions", "string",
+        N_("conditions to display a buffer "
+           "(note: content is evaluated, see /help buflist)"),
         NULL, 0, 0,
-        "number,-active",
+        "${buffer.hidden}==0",
         NULL, 0,
         NULL, NULL, NULL,
-        &buflist_config_change_sort, NULL, NULL,
+        &buflist_config_change_signals_refresh, NULL, NULL,
         NULL, NULL, NULL);
     buflist_config_look_signals_refresh = weechat_config_new_option (
         buflist_config_file, ptr_section,
@@ -231,6 +231,18 @@ buflist_config_init ()
         NULL, NULL, NULL,
         &buflist_config_change_signals_refresh, NULL, NULL,
         NULL, NULL, NULL);
+    buflist_config_look_sort = weechat_config_new_option (
+        buflist_config_file, ptr_section,
+        "sort", "string",
+        N_("comma-separated list of fields to sort buffers; each field is "
+           "a hdata variable of buffer; char \"-\" can be used before field "
+           "to reverse order"),
+        NULL, 0, 0,
+        "number,-active",
+        NULL, 0,
+        NULL, NULL, NULL,
+        &buflist_config_change_sort, NULL, NULL,
+        NULL, NULL, NULL);
 
     /* format */
     ptr_section = weechat_config_new_section (buflist_config_file, "format",

src/plugins/buflist/buflist-config.h

@@ -24,6 +24,7 @@
 
 extern struct t_config_file *buflist_config_file;
 
+extern struct t_config_option *buflist_config_look_display_conditions;
 extern struct t_config_option *buflist_config_look_signals_refresh;
 extern struct t_config_option *buflist_config_look_sort;