[ui] top should not move when new data comes in

Author: tstack

NEWS.md

@@ -7,6 +7,10 @@ Bug Fixes:
 * The abbreviated month `%b` time-conversion was not
   always falling back to English locale, which could
   prevent lnav from starting up.
+* The top of the LOG view could move in some cases when
+  filtering was enabled.
+* Some status bar fields were not always showing
+  updates.
 
 ## lnav v0.13.1
 

src/bottom_status_source.cc

@@ -169,8 +169,8 @@ bottom_status_source::update_hits(textview_curses* tc)
         }
         if (!sf.is_cylon()) {
             sf.set_cylon(true);
-            retval = true;
         }
+        retval = true;
     } else {
         new_role = role_t::VCR_STATUS;
         if (sf.is_cylon()) {

src/filter_status_source.cc

@@ -201,18 +201,22 @@ filter_status_source::statusview_value_for_field(int field)
     return this->tss_fields[field];
 }
 
-void
+bool
 filter_status_source::update_filtered(text_sub_source* tss)
 {
     if (tss == nullptr) {
-        return;
+        return false;
     }
 
     auto& sf = this->tss_fields[TSF_FILTERED];
+    auto retval = false;
 
     if (tss->get_filtered_count() == 0) {
         if (tss->tss_apply_filters) {
-            sf.clear();
+            if (!sf.empty()) {
+                sf.clear();
+                retval = true;
+            }
         } else {
             sf.set_value(
                 " \u2718 Filtering disabled, re-enable with " ANSI_BOLD_START
@@ -228,14 +232,18 @@ filter_status_source::update_filtered(text_sub_source* tss)
                 al.with_attr(
                     string_attr(line_range{0, -1},
                                 VC_STYLE.value(text_attrs::with_bold())));
+                retval = true;
             }
         } else {
             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;
         }
-        sf.set_value("%'9d Lines not shown ", tss->get_filtered_count());
     }
+
+    return retval;
 }
 
 filter_help_status_source::filter_help_status_source()

src/filter_status_source.hh

@@ -55,7 +55,7 @@ public:
 
     status_field& statusview_value_for_field(int field) override;
 
-    void update_filtered(text_sub_source* tss);
+    bool update_filtered(text_sub_source* tss);
 
 private:
     status_field tss_fields[TSF__MAX];

src/lnav.cc

@@ -1031,10 +1031,12 @@ struct refresh_status_bars {
         {
             prompt.p_editor.set_inactive_value(cancel_msg);
         }
-
         if (!lnav_data.ld_log_source.is_indexing_in_progress()
-            || lnav_data.ld_log_source.text_line_count() == 0)
+            || lnav_data.ld_log_source.lss_index_generation == 0)
         {
+            if (lnav_data.ld_log_source.lss_index_generation == 0) {
+                lnav_data.ld_view_stack.top().value()->set_needs_update();
+            }
             lnav_data.ld_view_stack.do_update();
         }
         if (this->rsb_top_source->update_time(current_time)) {
@@ -1534,10 +1536,9 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
         if (link_iter != al.al_attrs.end()) {
             auto href = link_iter->sa_value.get<std::string>();
             if (!startswith(href, "#")) {
-                ec.execute_with(
-                    INTERNAL_SRC_LOC,
-                    ":xopen $href",
-                    std::make_pair("href", href));
+                ec.execute_with(INTERNAL_SRC_LOC,
+                                ":xopen $href",
+                                std::make_pair("href", href));
             }
         }
     };

src/lnav.indexing.cc

@@ -433,7 +433,9 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
         }
 
         auto* tss = tc->get_sub_source();
-        lnav_data.ld_filter_status_source.update_filtered(tss);
+        if (lnav_data.ld_filter_status_source.update_filtered(tss)) {
+            lnav_data.ld_status[LNS_FILTER].set_needs_update();
+        }
         if (retval.rir_changes > 0) {
             lnav_data.ld_scroll_broadcaster(tc);
         }