Skip to content

Commit

Permalink
Merge pull request #1478 from contour-terminal/fix/binding_and_search
Browse files Browse the repository at this point in the history
Fix key bindings and search prompt
  • Loading branch information
christianparpart committed Feb 21, 2024
2 parents 01eb991 + 0428d27 commit df4a80b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<li>Add SGRSAVE and SGRRESTORE VT sequences to save and restore SGR state (They intentionally conflict with XTPUSHSGR and XTPOPSGR)</li>
<li>Fixes corruption of sixel image on high resolution (#1049)</li>
<li>Fixes bad wording of OS/X to macOS (#1462)</li>
<li>Fixed key bindings and search prompt collision (#1472)</li>
</ul>
</description>
</release>
Expand Down
4 changes: 3 additions & 1 deletion src/contour/TerminalSession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,10 @@ void TerminalSession::sendCharEvent(

if (eventType != KeyboardEventType::Release)
{
// find if action exist for the given key, and ignore if editing search prompt
if (auto const* actions =
config::apply(_config.inputMappings.value().charMappings, value, modifiers, matchModeFlags()))
config::apply(_config.inputMappings.value().charMappings, value, modifiers, matchModeFlags());
actions && !_terminal.inputHandler().isEditingSearch())
{
executeAllActions(*actions);
return;
Expand Down

0 comments on commit df4a80b

Please sign in to comment.