summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/keys.cc4
-rw-r--r--src/ncurses_ui.cc11
2 files changed, 15 insertions, 0 deletions
diff --git a/src/keys.cc b/src/keys.cc
index 29fa9ce1..b6761584 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -229,6 +229,10 @@ UnitTest test_keys{[]()
alt('j'),
ctrl('r'),
shift(Key::Up),
+ ctrl('['),
+ ctrl('\\'),
+ ctrl(']'),
+ ctrl('_'),
};
String keys_as_str;
for (auto& key : keys)
diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc
index 14308c98..732f009f 100644
--- a/src/ncurses_ui.cc
+++ b/src/ncurses_ui.cc
@@ -623,8 +623,19 @@ Optional<Key> NCursesUI::get_next_key()
kill(0, SIGTSTP); // We suspend at this line
return {};
}
+ // Special case: you can type NUL with Ctrl-2 or Ctrl-Shift-2 or
+ // Ctrl-Backtick, but the most straightforward way is Ctrl-Space.
+ if (c == 0)
+ return ctrl(' ');
+ // Represent Ctrl-letter combinations in lower-case, to be clear
+ // that Shift is not involved.
if (c < 27)
return ctrl(c - 1 + 'a');
+ // Represent Ctrl-symbol combinations in "upper-case", as they are
+ // traditionally-rendered.
+ // Note that Escape is handled elsewhere.
+ if (c < 32)
+ return ctrl(c - 1 + 'A');
struct Sentinel{};
struct CharIterator