[Refactor] #2138 Separated process_control_command() from request_command()

diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index 9918ceb..3fd167c 100644 (file)
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -78,12 +78,7 @@ void InputKeyRequestor::request_command()
         }
 
         this->process_command_command(&cmd);
-        if (cmd == '^') {
-            if (get_com(_("CTRL: ", "Control: "), (char *)&cmd, false)) {
-                cmd = KTRL(cmd);
-            }
-        }
-
+        this->process_control_command(&cmd);
         auto act = keymap_act[mode][(byte)(cmd)];
         if (act && !inkey_next) {
             (void)strnfmt(this->request_command_buffer, sizeof(this->request_command_buffer), "%s", act);
@@ -409,3 +404,14 @@ void InputKeyRequestor::process_command_command(short *cmd)
         inkey_next = "";
     }
 }
+
+void InputKeyRequestor::process_control_command(short *cmd)
+{
+    if (*cmd != '^') {
+        return;
+    }
+
+    if (get_com(_("CTRL: ", "Control: "), (char *)cmd, false)) {
+        *cmd = KTRL(*cmd);
+    }
+}

diff --git a/src/io/input-key-requester.h b/src/io/input-key-requester.h
index b83e04a..4452653 100644 (file)
--- a/src/io/input-key-requester.h
+++ b/src/io/input-key-requester.h
@@ -32,4 +32,5 @@ private:
     bool process_repeat_num(short *cmd);
     char input_repeat_num();
     void process_command_command(short *cmd);
+    void process_control_command(short *cmd);
 };