From d6b32d60be9206bad25ec2694a12cdb029594a0b Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal Date: Fri, 8 May 2015 22:31:56 -0700 Subject: [PATCH] [lo-fi shortcut] Change shortcut to 'Ctrl-l'. * Change the 'lo-fi' shortcut to 'Ctrl-l' * Remove the shortcut for 'redraw' --- NEWS | 5 +++++ docs/source/hotkeys.rst | 2 +- src/help.txt | 6 ++---- src/lnav.cc | 6 +----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index ea350240..896f14c4 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,13 @@ lnav v0.7.4: + Features: + * Added support for 'VMware vSphere Auto Deploy' log format. + Fixes: * Nested fields in JSON logs are now supported for levels, bodies, etc... * Tab-completion should work for quoted SQL identifiers. + * 'lo-fi' mode key shortcut changed to CTRL+L. + * 'redraw' shortcut removed. Relegated to just a command. lnav v0.7.3: Features: diff --git a/docs/source/hotkeys.rst b/docs/source/hotkeys.rst index 8eb03194..ee46ccb6 100644 --- a/docs/source/hotkeys.rst +++ b/docs/source/hotkeys.rst @@ -193,7 +193,7 @@ Display - Toggle the display of the log parser results * - |ks| Tab |ke| - Cycle through colums to graph in the SQL result view - * - |ks| Shift |ke| + |ks| l |ke| + * - |ks| Ctrl |ke| + |ks| l |ke| - Switch to lo-fi mode. The displayed log lines will be dumped to the terminal without any decorations so they can be copied easily. diff --git a/src/help.txt b/src/help.txt index ac1adb2a..d50c169c 100644 --- a/src/help.txt +++ b/src/help.txt @@ -168,7 +168,7 @@ through the file. t Switch to/from the text file view. The text file view is for any files that are not recognized as log files. - L (Lo-fi mode) Exit screen-mode and write the + Ctrl-L (Lo-fi mode) Exit screen-mode and write the displayed log lines in plain text to the terminal until a key is pressed. Useful for copying long lines from the terminal without picking up any of the extra @@ -326,8 +326,6 @@ through the file. CTRL-W Toggle word-wrapping. - CTRL-L Force redraw the window. - r/R Restore the next/previous session. The current session is saved and then the new state is restored. @@ -492,7 +490,7 @@ COMMANDS Change the histogram zoom level to the given value, which can be one of: day, 4-hour, hour, 10-minute, minute - redraw Force redraw the window (CTRL-L hotkey). + redraw Force redraw the window. partition-name Mark the top line in the log view as the start of a new diff --git a/src/lnav.cc b/src/lnav.cc index d30e5422..a3535dd0 100644 --- a/src/lnav.cc +++ b/src/lnav.cc @@ -1778,7 +1778,7 @@ static void handle_paging_key(int ch) } break; - case 'L': { + case KEY_CTRL_L: { vis_line_t top = tc->get_top(); vis_line_t bottom = tc->get_bottom(); char line_break[120]; @@ -2361,10 +2361,6 @@ static void handle_paging_key(int ch) "disable-word-wrap" : "enable-word-wrap"); break; - case KEY_CTRL_L: - execute_command("redraw"); - break; - default: log_warning("unhandled %d", ch); lnav_data.ld_rl_view->set_value("Unrecognized keystroke, press "