[vt52] fix key handling

Author: tstack

src/column_namer.cc

@@ -38,7 +38,7 @@
 #include "config.h"
 #include "sql_util.hh"
 
-const auto column_namer::BUILTIN_COL = string_fragment::from_const("col");
+const string_fragment column_namer::BUILTIN_COL = string_fragment::from_const("col");
 
 column_namer::column_namer(language lang) : cn_language(lang)
 {

src/grep_proc.cc

@@ -197,7 +197,7 @@ grep_proc<LineType>::child_loop()
             // When scanning to the end of the source, we need to return the
             // highest line that was seen so that the next request that
             // continues from the end works properly.
-            fmt::println(stdout, FMT_STRING("h%d"), line - 1);
+            fmt::println(stdout, FMT_STRING("h{}"), line - 1);
         }
         this->gp_highest_line = line - 1_vl;
         this->child_term();

src/vt52_curses.cc

@@ -132,20 +132,26 @@ string_fragment
 vt52_curses::map_input(const ncinput& ch)
 {
     /* Check for an escape sequence, otherwise just return the char. */
-    const auto esc = vt52_escape_map::singleton()[ch.id];
-    if (esc) {
-        return esc.value();
+    if (ch.modifiers == 0) {
+        const auto esc = vt52_escape_map::singleton()[ch.id];
+        if (esc) {
+            return esc.value();
+        }
     }
     if (ch.id == 0x7f) {
         this->vc_map_buffer = static_cast<char>(ch.id);
         return string_fragment::from_c_str(&this->vc_map_buffer);
     }
 
-    if (ncinput_shift_p(&ch) && ch.id == NCKEY_LEFT) {
+    if ((ncinput_shift_p(&ch) || ncinput_ctrl_p(&ch) || ncinput_alt_p(&ch))
+        && ch.id == NCKEY_LEFT)
+    {
         return string_fragment::from_const("\033b");
     }
 
-    if (ncinput_shift_p(&ch) && ch.id == NCKEY_RIGHT) {
+    if ((ncinput_shift_p(&ch) || ncinput_ctrl_p(&ch) || ncinput_alt_p(&ch))
+        && ch.id == NCKEY_RIGHT)
+    {
         return string_fragment::from_const("\033f");
     }