[files] bookmarks for files panel

Author: tstack

src/files_sub_source.cc

@@ -173,14 +173,6 @@ files_sub_source::list_input_handle_key(listview_curses& lv, const ncinput& ch)
                       });
             return true;
         }
-        case 'n': {
-            execute_command(lnav_data.ld_exec_context, "next-mark search");
-            return true;
-        }
-        case 'N': {
-            execute_command(lnav_data.ld_exec_context, "prev-mark search");
-            return true;
-        }
         case '/': {
             execute_command(lnav_data.ld_exec_context, "prompt search-files");
             return true;
@@ -374,7 +366,7 @@ files_sub_source::text_value_for_line(textview_curses& tc,
                                        humanize::alignment::columnar));
     }
     al.append(" ");
-    auto indexed_size = lf->get_indexed_file_offset();
+    auto indexed_size = lf->get_index_size();
     auto total_size = lf->get_content_size();
     if (!lf->get_decompress_error().empty()) {
         al.append(" ", VC_ICON.value(ui_icon_t::error));
@@ -487,6 +479,52 @@ files_sub_source::text_handle_mouse(
     return false;
 }
 
+void
+files_sub_source::text_update_marks(vis_bookmarks& bm)
+{
+    auto& bm_errs = bm[&textview_curses::BM_ERRORS];
+    auto& bm_warn = bm[&textview_curses::BM_WARNINGS];
+
+    bm_errs.clear();
+    bm_warn.clear();
+
+    auto index = 0_vl;
+
+    auto& fc = lnav_data.ld_active_files;
+    {
+        safe::ReadAccess<safe_name_to_stubs> stubs(*fc.fc_name_to_stubs);
+
+        for (const auto& stub_pair : *stubs) {
+            switch (stub_pair.second.fei_description.um_level) {
+                case lnav::console::user_message::level::warning:
+                    bm_warn.insert_once(index);
+                    break;
+                case lnav::console::user_message::level::error:
+                    bm_errs.insert_once(index);
+                    break;
+                default:
+                    break;
+            }
+            index += 1_vl;
+        }
+    }
+
+    index += vis_line_t(fc.fc_other_files.size());
+
+    for (const auto& lf : fc.fc_files) {
+        if (!lf->get_decompress_error().empty()) {
+            bm_errs.insert_once(index);
+        } else if (!lf->get_notes().empty()) {
+            bm_warn.insert_once(index);
+        }
+        index += 1_vl;
+    }
+
+    log_debug("files bookmarks errors=%zu; warnings=%zu",
+              bm_errs.size(),
+              bm_warn.size());
+}
+
 void
 files_sub_source::text_selection_changed(textview_curses& tc)
 {

src/files_sub_source.hh

@@ -76,6 +76,8 @@ public:
                            const listview_curses::display_line_content_t&,
                            mouse_event& me) override;
 
+    void text_update_marks(vis_bookmarks& bm) override;
+
     void text_selection_changed(textview_curses& tc) override;
 
     size_t fss_last_line_len{0};

src/filter_status_source.cc

@@ -250,7 +250,10 @@ filter_status_source::update_filtered(text_sub_source* tss)
         auto& al = sf.get_value();
 
         if (curr_filtered_count == this->bss_last_filtered_count) {
-            if (timer.fade_diff(this->bss_filter_counter) == 0) {
+            if (timer.fade_diff(this->bss_filter_counter) == 0
+                && this->tss_fields[TSF_FILTERED].get_role()
+                    != role_t::VCR_STATUS)
+            {
                 this->tss_fields[TSF_FILTERED].set_role(role_t::VCR_STATUS);
                 al.with_attr(
                     string_attr(line_range{0, -1},
@@ -261,8 +264,8 @@ filter_status_source::update_filtered(text_sub_source* tss)
             this->tss_fields[TSF_FILTERED].set_role(role_t::VCR_ALERT_STATUS);
             this->bss_last_filtered_count = tss->get_filtered_count();
             timer.start_fade(this->bss_filter_counter, 3);
-            sf.set_value("%'9d Lines not shown ", tss->get_filtered_count());
-            retval = true;
+            retval = sf.set_value("%'9d Lines not shown ",
+                                  tss->get_filtered_count());
         }
     }