From e90eea874d0361faf7ac5def3df3c221cadd9309 Mon Sep 17 00:00:00 2001 From: Mooffie Date: Mon, 24 Apr 2017 08:53:00 +0300 Subject: [PATCH] QuickView shouldn't consume all keys. The QuickView should return MSG_HANDLED, in its MSG_KEY, *only* for keys it has indeed handled. We move the "don't pass any chars to command line" responsibility to the main dialog instead. (We're reverting commit 8469c13f383720 here.) Signed-off-by: Mooffie --- src/filemanager/midnight.c | 2 +- src/viewer/actions_cmd.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index 3d78c45ce..9c895c6a7 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -1569,7 +1569,7 @@ midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void if (command != CK_IgnoreKey) v = midnight_execute_cmd (NULL, command); - if (v == MSG_NOT_HANDLED && command_prompt) + if (v == MSG_NOT_HANDLED && command_prompt && !is_cmdline_mute ()) v = send_message (cmdline, NULL, MSG_KEY, parm, NULL); return v; diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 3e23469e4..37fddd244 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -674,8 +674,7 @@ mcview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * case MSG_KEY: i = mcview_handle_key (view, parm); mcview_update (view); - /* don't pass any chars to command line in QuickView mode */ - return mcview_is_in_panel (view) ? MSG_HANDLED : i; + return i; case MSG_ACTION: i = mcview_execute_cmd (view, parm);