Robot
/
lnav
mirror of https://github.com/tstack/lnav.git
2
0
Fork 0
Code Issues Releases Wiki Activity

[filters-view] key capture fix 

Fixes #898
This commit is contained in:
Timothy Stack 2021-08-16 10:29:59 -07:00
parent e33fe1a85b
commit 383bf71f26
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -6,6 +6,8 @@ lnav v0.10.1:
* Configuration values loaded from the ~/.lnav/configs directory
are now included in the default configuration, so they won't be
saved into the ~/.lnav/config.json user configuration file.
* Key handling in the visual filter editor will no longer swallow
certain key-presses when editing a filter.
lnav v0.10.0:
Features:

43
src/lnav.cc
View File

@ -1008,6 +1008,23 @@ private:
static bool handle_config_ui_key(int ch)
{
bool retval = false;
switch (lnav_data.ld_mode) {
case LNM_FILES:
retval = lnav_data.ld_files_view.handle_key(ch);
break;
case LNM_FILTER:
retval = lnav_data.ld_filter_view.handle_key(ch);
break;
default:
ensure(0);
}
if (retval) {
return retval;
}
nonstd::optional<ln_mode_t> new_mode;
lnav_data.ld_filter_help_status_source.fss_error.clear();
@ -1015,40 +1032,26 @@ static bool handle_config_ui_key(int ch)
new_mode = LNM_FILES;
} else if (ch == 'T') {
new_mode = LNM_FILTER;
}
if (!lnav_data.ld_filter_source.fss_editing &&
(ch == '\t' || ch == KEY_BTAB)) {
} else if (ch == '\t' || ch == KEY_BTAB) {
if (lnav_data.ld_mode == LNM_FILES) {
new_mode = LNM_FILTER;
} else {
new_mode = LNM_FILES;
}
} else if (ch == 'q') {
new_mode = LNM_PAGING;
}
if (ch == 'q') {
lnav_data.ld_mode = LNM_PAGING;
} else if (new_mode) {
if (new_mode) {
lnav_data.ld_last_config_mode = new_mode.value();
lnav_data.ld_mode = new_mode.value();
lnav_data.ld_files_view.reload_data();
lnav_data.ld_filter_view.reload_data();
lnav_data.ld_status[LNS_FILTER].set_needs_update();
} else {
switch (lnav_data.ld_mode) {
case LNM_FILES:
if (!lnav_data.ld_files_view.handle_key(ch)) {
return handle_paging_key(ch);
}
break;
case LNM_FILTER:
if (!lnav_data.ld_filter_view.handle_key(ch)) {
return handle_paging_key(ch);
}
break;
default:
ensure(0);
}
return handle_paging_key(ch);
}
return true;
}