aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cmdline.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-07 02:45:56 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-07 02:54:09 +0100
commit2789e5da50987b908a4aa5758a17c86570d94d63 (patch)
treea60f11f3b82ff3d7ff0a07bf576f851f68165266 /src/cmdline.cpp
parent4aa51b925f5364511173c74277b78d2984e37218 (diff)
downloadsciteco-2789e5da50987b908a4aa5758a17c86570d94d63.tar.gz
cleaned up usage of the escape control character: introduced CTL_KEY_ESC and CTL_KEY_ESC_STR
* the reason for the CTL_KEY() macro is to get the control character resulting from a CTRL+Key press -- at least this is how SciTECO presents these key presses. It is also a macro and may be resolved to a constant expression, so it can be used in switch-case statements. Sometimes it is clearer to use standard C escape sequences (like '\t'). * CTL_KEY('[') for escape is hard to read, so I always used '\x1B' which is even more cryptic.
Diffstat (limited to 'src/cmdline.cpp')
-rw-r--r--src/cmdline.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmdline.cpp b/src/cmdline.cpp
index a995d55..888a70c 100644
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -102,7 +102,7 @@ copy(void) const
void
Cmdline::replace(void)
{
- QRegister *cmdline_reg = QRegisters::globals["\x1B"];
+ QRegister *cmdline_reg = QRegisters::globals[CTL_KEY_ESC_STR];
/* use heap object to avoid copy constructors etc. */
Cmdline *new_cmdline = new Cmdline();
@@ -426,11 +426,11 @@ Cmdline::process_edit_cmd(gchar key)
}
break;
- case '\x1B': /* terminate command line */
+ case CTL_KEY_ESC: /* terminate command line */
interface.popup_clear();
if (States::current == &States::start &&
- str && str[len-1] == '\x1B') {
+ str && str[len-1] == CTL_KEY_ESC) {
if (Goto::skip_label) {
interface.msg(InterfaceCurrent::MSG_ERROR,
"Label \"%s\" not found",