[keymap] change CTRL-F to toggle filtering

tstack · tstack · commit 1ca4a633d6ae · 2025-12-13T10:36:52.000-08:00
diff --git a/NEWS.md b/NEWS.md
@@ -187,6 +187,8 @@ Breaking changes:
 
 Interface changes:
 * Mouse mode is now enabled by default.
+* The `CTRL+f` hotkey has been remapped to the
+  `:toggle-filtering` command.
 * Aborting the prompt now requires two successive
   presses of `Esc` (a message will pop up on the right
   that mentions this).  Since `Esc` is also used to
diff --git a/src/filter_status_source.cc b/src/filter_status_source.cc
@@ -36,6 +36,8 @@
 #include "filter_sub_source.hh"
 #include "lnav.hh"
 
+using namespace lnav::roles::literals;
+
 static constexpr auto TOGGLE_MSG = "Press " ANSI_HOTKEY("TAB") " to edit "_frag;
 static constexpr auto EXIT_MSG = "Press " ANSI_HOTKEY("ESC") " to exit "_frag;
 
@@ -242,9 +244,11 @@ filter_status_source::update_filtered(text_sub_source* tss)
                 retval = true;
             }
         } else {
-            retval = sf.set_value(
-                " \u2718 Filtering disabled, re-enable with " ANSI_BOLD_START
-                ":toggle-filtering" ANSI_NORM);
+            auto al = attr_line_t(" ")
+                          .append("  ", VC_ICON.value(ui_icon_t::warning))
+                          .append(" Filtering disabled, re-enable with ")
+                          .append(":toggle-filtering"_symbol);
+            retval = sf.set_value(al);
         }
         this->bss_last_filtered_count = curr_filtered_count;
     } else {
diff --git a/src/keymaps/default-keymap.json b/src/keymaps/default-keymap.json
@@ -79,7 +79,7 @@
                     "command": ";UPDATE lnav_top_view SET selection = CASE WHEN name = 'log' AND log_msg_line() != selection THEN log_msg_line() ELSE max(0, selection - inner_height / 10) END"
                 },
                 "x06": {
-                    "command": ";UPDATE lnav_view_filters SET enabled = 1 - enabled WHERE view_name = (SELECT name FROM lnav_view_stack WHERE name in ('log', 'text') ORDER BY rowid DESC LIMIT 1)"
+                    "command": ":toggle-filtering"
                 },
                 "x0c": {
                     "command": ":write-screen-to -"
diff --git a/src/lnav.cc b/src/lnav.cc
@@ -2114,7 +2114,9 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
         if (lnav_data.ld_user_message_view.do_update()) {
             updated_views.emplace_back(&lnav_data.ld_user_message_view);
         }
-        if (ui_now >= next_status_update_time) {
+        if (ui_now >= next_status_update_time
+            || lnav_data.ld_status[LNS_FILTER].get_needs_update())
+        {
             if (exec_phase.scanning()) {
                 lnav_data.ld_files_view.set_needs_update();
             }
diff --git a/src/lnav_commands.cc b/src/lnav_commands.cc
@@ -2225,10 +2225,12 @@ com_toggle_filtering(exec_context& ec,
     std::string retval;
 
     if (!ec.ec_dry_run) {
-        auto tc = *lnav_data.ld_view_stack.top();
-        auto tss = tc->get_sub_source();
+        auto* tc = *lnav_data.ld_view_stack.top();
+        auto* tss = tc->get_sub_source();
 
         tss->toggle_apply_filters();
+        lnav_data.ld_filter_status_source.update_filtered(tss);
+        lnav_data.ld_status[LNS_FILTER].set_needs_update();
     }
 
     return Ok(retval);
diff --git a/src/statusview_curses.cc b/src/statusview_curses.cc
@@ -79,6 +79,17 @@ status_field::set_value(const char* fmt, ...)
     return retval;
 }
 
+bool
+status_field::set_value(const attr_line_t& value)
+{
+    if (value.al_string == this->sf_value.al_string) {
+        return false;
+    }
+
+    this->sf_value = value;
+    return true;
+}
+
 void
 status_field::do_cylon()
 {
diff --git a/src/statusview_curses.hh b/src/statusview_curses.hh
@@ -68,6 +68,8 @@ public:
      */
     bool set_value(const char* fmt, ...);
 
+    bool set_value(const attr_line_t& value);
+
     void set_stitch_value(role_t left, role_t right);
 
     void set_left_pad(size_t val) { this->sf_left_pad = val; }
diff --git a/src/textfile_sub_source.cc b/src/textfile_sub_source.cc
@@ -875,6 +875,8 @@ textfile_sub_source::rescan_files(textfile_sub_source::scan_callback& callback,
                                 = lnav::document::discover(content)
                                       .with_text_format(lf->get_text_format())
                                       .perform();
+                            log_info("  metadata indents size: %zu",
+                                     iter->fvs_metadata.m_indents.size());
                         }
                     } else {
                         auto errmsg = read_res.unwrapErr();
diff --git a/src/third-party/notcurses/src/lib/egcpool.h b/src/third-party/notcurses/src/lib/egcpool.h
@@ -117,13 +117,13 @@ utf8_egc_len(const char* gcluster, int* colcount){
     if(uc_is_property_variation_selector(wc)){ // ends EGC
       ret += r;
       break;
-    }else if(wc == L'\u200d' || injoin){ // ZWJ is iswcntrl, so check it first
+    }else if(wc == L'\u200d'){ // ZWJ is iswcntrl, so check it first
       injoin = true;
       cols = 0;
     }else{
       cols = uc_width(wc, "UTF-8");
+      injoin = false;
       if(cols < 0){
-        injoin = false;
         if(iswspace(wc)){ // newline or tab
           *colcount = 1;
           return ret + 1;
diff --git a/src/view_curses.cc b/src/view_curses.cc
@@ -260,7 +260,7 @@ view_curses::mvwattrline(ncplane* window,
                          int y,
                          const int x,
                          attr_line_t& al,
-                         const struct line_range& lr_chars,
+                         const line_range& lr_chars,
                          role_t base_role)
 {
     auto& sa = al.get_attrs();
@@ -286,9 +286,12 @@ view_curses::mvwattrline(ncplane* window,
         }
     }
 
+    auto last_ch_col_count = 0;
+    std::optional<int> join_start_index;
     for (size_t lpc = 0; lpc < line.size();) {
         int exp_start_index = expanded_line.size();
         auto ch = static_cast<unsigned char>(line[lpc]);
+        auto curr_ch_col_count = 0;
 
         if (char_index == lr_chars.lr_start) {
             lr_bytes.lr_start = exp_start_index;
@@ -299,8 +302,10 @@ view_curses::mvwattrline(ncplane* window,
 
         switch (ch) {
             case '\t': {
+                auto tab_size = 0;
                 do {
                     expanded_line.push_back(' ');
+                    tab_size += 1;
                     char_index += 1;
                     if (char_index == lr_chars.lr_start) {
                         lr_bytes.lr_start = expanded_line.size();
@@ -309,7 +314,8 @@ view_curses::mvwattrline(ncplane* window,
                         lr_bytes.lr_end = expanded_line.size();
                         retval.mr_chars_out = char_index;
                     }
-                } while (expanded_line.size() % 8);
+                } while (expanded_line.size() % 8 > 0);
+                curr_ch_col_count = tab_size;
                 utf_adjustments.emplace_back(
                     lpc, expanded_line.size() - exp_start_index - 1);
                 lpc += 1;
@@ -319,27 +325,31 @@ view_curses::mvwattrline(ncplane* window,
             case '\x1b':
                 expanded_line.append("\u238b");
                 utf_adjustments.emplace_back(lpc, -1);
+                curr_ch_col_count = 1;
                 char_index += 1;
                 lpc += 1;
                 break;
 
             case '\b':
                 expanded_line.append("\u232b");
                 utf_adjustments.emplace_back(lpc, -1);
+                curr_ch_col_count = 1;
                 char_index += 1;
                 lpc += 1;
                 break;
 
             case '\x07':
                 expanded_line.append("\U0001F514");
                 utf_adjustments.emplace_back(lpc, -1);
+                curr_ch_col_count = 1;
                 char_index += 1;
                 lpc += 1;
                 break;
 
             case '\r':
             case '\n':
                 expanded_line.push_back(' ');
+                curr_ch_col_count = 1;
                 char_index += 1;
                 lpc += 1;
                 break;
@@ -349,6 +359,7 @@ view_curses::mvwattrline(ncplane* window,
                     expanded_line.push_back(0xe2);
                     expanded_line.push_back(0x90);
                     expanded_line.push_back(0x80 + ch);
+                    curr_ch_col_count = 1;
                     char_index += 1;
                     lpc += 1;
                     break;
@@ -368,21 +379,26 @@ view_curses::mvwattrline(ncplane* window,
                         "error:%d:%zu:%s", y, x + lpc, read_res.unwrapErr());
                     expanded_line.resize(exp_read_start);
                     expanded_line.push_back('?');
+                    curr_ch_col_count = 1;
                     char_index += 1;
                     lpc = lpc_start + 1;
                 } else {
                     auto wch = read_res.unwrap();
+                    if (wch == L'\u200d') {
+                        join_start_index = char_index - last_ch_col_count;
+                        continue;
+                    }
                     auto wcw_res = uc_width(wch, "UTF-8");
                     if (wcw_res < 0) {
-                        log_trace(
-                            "uc_width(%x) does not recognize width character",
-                            wch);
+                        log_trace("uc_width(%x) does not recognize character",
+                                  wch);
                         wcw_res = 1;
                     }
                     if (lpc > (lpc_start + 1)) {
                         utf_adjustments.emplace_back(
                             lpc_start, wcw_res - (lpc - lpc_start));
                     }
+                    curr_ch_col_count = wcw_res;
                     char_index += wcw_res;
                     if (lr_bytes.lr_end == -1 && char_index > lr_chars.lr_end) {
                         lr_bytes.lr_end = exp_start_index;
@@ -392,6 +408,15 @@ view_curses::mvwattrline(ncplane* window,
                 break;
             }
         }
+        if (join_start_index) {
+            curr_ch_col_count = std::max(last_ch_col_count, curr_ch_col_count);
+            char_index = join_start_index.value() + curr_ch_col_count;
+            if (char_index > lr_chars.lr_end) {
+                retval.mr_chars_out = char_index;
+            }
+            join_start_index = std::nullopt;
+        }
+        last_ch_col_count = curr_ch_col_count;
     }
     if (lr_bytes.lr_start == -1) {
         lr_bytes.lr_start = expanded_line.size();
@@ -947,7 +972,8 @@ view_colors::init_roles(const lnav_theme& lt,
     std::string err;
 
     size_t icon_index = 0;
-    for (const auto& ic : {
+    for (const auto& ic :
+         {
              lt.lt_icon_hidden,
              lt.lt_icon_ok,
              lt.lt_icon_info,
@@ -1167,8 +1193,7 @@ view_colors::init_roles(const lnav_theme& lt,
                 auto new_cursor_bg = this->match_color(
                     styling::color_unit::from_rgb(adjusted_cursor.to_rgb()));
                 this->get_role_attrs(role_t::VCR_CURSOR_LINE)
-                    .ra_normal.ta_bg_color
-                    = new_cursor_bg;
+                    .ra_normal.ta_bg_color = new_cursor_bg;
             }
             if (lt.lt_style_popup.pp_value.sc_background_color.empty()) {
                 auto adjusted_cursor = bg_as_lab;
@@ -1192,8 +1217,7 @@ view_colors::init_roles(const lnav_theme& lt,
                 auto new_cursor_bg = this->match_color(
                     styling::color_unit::from_rgb(adjusted_cursor.to_rgb()));
                 this->get_role_attrs(role_t::VCR_INLINE_CODE)
-                    .ra_normal.ta_bg_color
-                    = new_cursor_bg;
+                    .ra_normal.ta_bg_color = new_cursor_bg;
             }
             if (lt.lt_style_quoted_code.pp_value.sc_background_color.empty()) {
                 auto adjusted_cursor = bg_as_lab;
@@ -1205,11 +1229,9 @@ view_colors::init_roles(const lnav_theme& lt,
                 auto new_cursor_bg = this->match_color(
                     styling::color_unit::from_rgb(adjusted_cursor.to_rgb()));
                 this->get_role_attrs(role_t::VCR_QUOTED_CODE)
-                    .ra_normal.ta_bg_color
-                    = new_cursor_bg;
+                    .ra_normal.ta_bg_color = new_cursor_bg;
                 this->get_role_attrs(role_t::VCR_CODE_BORDER)
-                    .ra_normal.ta_bg_color
-                    = new_cursor_bg;
+                    .ra_normal.ta_bg_color = new_cursor_bg;
             }
         }
     }
diff --git a/src/views_vtab.cc b/src/views_vtab.cc
@@ -331,8 +331,7 @@ CREATE TABLE lnav_db.lnav_views (
         switch (col) {
             case 0: {
                 const auto& vs = lnav_view_strings[view_index];
-                sqlite3_result_text(
-                    ctx, vs.data(), vs.length(), SQLITE_STATIC);
+                sqlite3_result_text(ctx, vs.data(), vs.length(), SQLITE_STATIC);
                 break;
             }
             case 1:
@@ -767,6 +766,8 @@ CREATE TABLE lnav_db.lnav_views (
         {
             tss->tss_apply_filters = do_filtering;
             tss->text_filters_changed();
+            lnav_data.ld_filter_status_source.update_filtered(tss);
+            lnav_data.ld_status[LNS_FILTER].set_needs_update();
         }
 
         return SQLITE_OK;
@@ -1373,11 +1374,11 @@ CREATE TABLE lnav_db.lnav_view_files (
 };
 
 auto a = injector::bind_multiple<vtab_module_base>()
-                    .add<vtab_module<lnav_views>>()
-                    .add<vtab_module<lnav_view_stack>>()
-                    .add<vtab_module<lnav_view_filters>>()
-                    .add<vtab_module<tvt_no_update<lnav_view_filter_stats>>>()
-                    .add<vtab_module<lnav_view_files>>();
+             .add<vtab_module<lnav_views>>()
+             .add<vtab_module<lnav_view_stack>>()
+             .add<vtab_module<lnav_view_filters>>()
+             .add<vtab_module<tvt_no_update<lnav_view_filter_stats>>>()
+             .add<vtab_module<lnav_view_files>>();
 
 }  // namespace
 
diff --git a/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out b/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out
@@ -7890,7 +7890,7 @@
                 },
                 "x06": {
                     "id": "",
-                    "command": ";UPDATE lnav_view_filters SET enabled = 1 - enabled WHERE view_name = (SELECT name FROM lnav_view_stack WHERE name in ('log', 'text') ORDER BY rowid DESC LIMIT 1)",
+                    "command": ":toggle-filtering",
                     "alt-msg": ""
                 },
                 "x0c": {

Original file line number	Diff line number	Diff line change
`@@ -2114,7 +2114,9 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),`
`2114`	`2114`	`if (lnav_data.ld_user_message_view.do_update()) {`
`2115`	`2115`	`updated_views.emplace_back(&lnav_data.ld_user_message_view);`
`2116`	`2116`	`}`
`2117`		`- if (ui_now >= next_status_update_time) {`
	`2117`	`+ if (ui_now >= next_status_update_time`
	`2118`	`+ \|\| lnav_data.ld_status[LNS_FILTER].get_needs_update())`
	`2119`	`+ {`
`2118`	`2120`	`if (exec_phase.scanning()) {`
`2119`	`2121`	`lnav_data.ld_files_view.set_needs_update();`
`2120`	`2122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,8 @@ textfile_sub_source::rescan_files(textfile_sub_source::scan_callback& callback,`
`875`	`875`	`= lnav::document::discover(content)`
`876`	`876`	`.with_text_format(lf->get_text_format())`
`877`	`877`	`.perform();`
	`878`	`+ log_info(" metadata indents size: %zu",`
	`879`	`+ iter->fvs_metadata.m_indents.size());`
`878`	`880`	`}`
`879`	`881`	`} else {`
`880`	`882`	`auto errmsg = read_res.unwrapErr();`