Merge branch 'master' into develop

Author: tstack

NEWS.md

@@ -60,8 +60,9 @@ Bug Fixes:
 ## lnav v0.14.1
 
 Features:
-* Added the `:reload-view` command, bound to `F5`, that
-  re-runs the operation that populated the current view.
+* Added the `:reload-view` command, bound to `F5`/`⌘-R`,
+  that re-runs the operation that populated the current
+  view.
   In the DB view, this re-executes the last SQL query; in
   the TIMELINE view, it rebuilds the index.  Views that
   don't have a meaningful reload report an error.
@@ -77,12 +78,12 @@ Features:
 * For terminals that support the Kitty Keyboard
   protocol, the following hotkeys are now supported
   in the prompt:
-    - ⌘-C to copy the current selection to the
-      clipboard.
-    - ⌘-A to select all text.
-    - ⌘-X to cut the current selection to the
-      clipboard.
-    - ⌘-Z to undo the last change.
+  - `⌘-C` to copy the current selection to the
+    clipboard.
+  - `⌘-A` to select all text.
+  - `⌘-X` to cut the current selection to the
+    clipboard.
+  - `⌘-Z` to undo the last change.
 * The `measure_with_units` collator now recognizes
   (KiB, MiB, ...).
 

src/command_executor.cc

@@ -637,8 +637,6 @@ execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)
             auto& dls = *(ec.ec_label_source_stack.back());
             if (!dls.dls_row_cursors.empty()) {
                 lnav_data.ld_views[LNV_DB].reload_data();
-                lnav_data.ld_views[LNV_DB].set_selection(0_vl);
-                lnav_data.ld_views[LNV_DB].set_left(0);
                 if (lnav_data.ld_flags.is_set<lnav_flags::headless>()) {
                     retval = "";
                     alt_msg = "";

src/db_status_source.cc

@@ -76,7 +76,7 @@ db_status_source::update_from_db_source()
     changed |= this->dss_fields[DSF_RELOAD].set_value(reload_al);
 
     attr_line_t query_al;
-    query_al.append(" ;").append(dls.dls_user_query);
+    query_al.append(";").append(dls.dls_user_query);
     readline_sql_highlighter(
         query_al, lnav::sql::dialect::sqlite, std::nullopt);
     changed |= this->dss_fields[DSF_QUERY].set_value(query_al);

src/field_overlay_source.cc

@@ -1026,6 +1026,15 @@ field_overlay_source::add_key_line_attrs(int key_size, bool last_line)
     sa.emplace_back(lr, VC_STYLE.value(text_attrs::with_bold()));
 }
 
+void
+field_overlay_source::reset()
+{
+    this->fos_anno_cache.clear();
+    this->fos_static_lines.clear();
+    this->fos_lines.clear();
+    this->fos_meta_lines.clear();
+}
+
 void
 field_overlay_source::list_value_for_overlay(
     const listview_curses& lv,

src/field_overlay_source.hh

@@ -51,11 +51,7 @@ public:
 
     void add_key_line_attrs(int key_size, bool last_line = false);
 
-    void reset() override
-    {
-        this->fos_lines.clear();
-        this->fos_meta_lines.clear();
-    }
+    void reset() override;
 
     bool list_static_overlay(const listview_curses& lv,
                              media_t media,

src/hotkeys.cc

@@ -205,6 +205,10 @@ handle_paging_key(notcurses* nc, const ncinput& ch, const char* keyseq)
         return true;
     }
 
+    if (ncinput_alt_p(&ch) || ncinput_super_p(&ch)) {
+        return false;
+    }
+
     auto* lss = dynamic_cast<logfile_sub_source*>(tc_tss);
     auto* text_accel_p = dynamic_cast<text_accel_source*>(tc_tss);
 

src/keymaps/default-keymap.json

@@ -26,6 +26,9 @@
                 "f5": {
                     "command": ":reload-view"
                 },
+                "cmd-x72": {
+                    "command": ":reload-view"
+                },
                 "f7": {
                     "command": "|lnav-moveto-breakpoint prev"
                 },

src/lnav.cc

@@ -3032,6 +3032,7 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%'
         for (auto& tc : lnav_data.ld_views) {
             tc.deinit();
         }
+        log_fos.reset();
 
         log_info("marking files as closed");
         for (auto& lf : lnav_data.ld_active_files.fc_files) {

src/logfile.cc

@@ -142,8 +142,9 @@ logfile::open(std::filesystem::path filename,
 
     lf_fd.close_on_exec();
 
-    log_info("Creating logfile: fd=%d; size=%" PRId64 "; mtime=%" PRId64
+    log_info("Creating logfile(%p): fd=%d; size=%" PRId64 "; mtime=%" PRId64
              "; filename=%s",
+             lf.get(),
              (int) lf_fd,
              (long long) lf->lf_stat.st_size,
              (long long) lf->lf_stat.st_mtime,
@@ -254,7 +255,9 @@ logfile::logfile(std::filesystem::path filename,
 
 logfile::~logfile()
 {
-    log_info("destructing logfile: %s", this->lf_filename_as_string.c_str());
+    log_info("destructing logfile(%p): %s",
+             this,
+             this->lf_filename_as_string.c_str());
 }
 
 bool

src/logfile.hh

@@ -115,6 +115,9 @@ public:
         const logfile_open_options& loo,
         auto_fd fd = auto_fd{});
 
+    logfile(const logfile&) = delete;
+    logfile& operator=(const logfile&) = delete;
+
     ~logfile() override;
 
     const logfile_activity& get_activity() const { return this->lf_activity; }