Interpreting escape sequence only for string typing

Author: houmain

keymapper.conf

@@ -138,11 +138,11 @@ ScrollLock >> Boss
   BracketLeft              >> '['
   Shift{BracketRight}      >> '}'
   BracketRight             >> ']'
-  Shift{Backquote}         >> Equal Space  # '` '
+  Shift{Backquote}         >> '`'
   Backquote                >> '~'
   Shift{2}                 >> '@'
   Shift{3}                 >> '#'
-  Shift{6}                 >> !Shift Backquote Space   # '^ '
+  Shift{6}                 >> '^'
   Shift{7}                 >> '&'
   Shift{8}                 >> '*'
   Shift{9}                 >> '('

src/client/unix/StringTyperImpl.cpp

@@ -106,7 +106,12 @@ StringTyper::Modifiers get_xkb_modifiers(uint32_t mask) {
 //-------------------------------------------------------------------------
 
 void StringTyperImpl::type(std::string_view string, const AddKey& add_key) const {
-  for (auto character : utf8_to_utf32(string))
+  auto characters = utf8_to_utf32(string);
+  replace_all<char32_t>(characters, U"\\n", U"\r");
+  replace_all<char32_t>(characters, U"\\r", U"\r");
+  replace_all<char32_t>(characters, U"\\t", U"\t");
+
+  for (auto character : characters)
     if (auto it = m_dictionary.find(character); it != m_dictionary.end())
       add_key(it->second.key, it->second.modifiers);
 }

src/client/windows/StringTyper.cpp

@@ -130,11 +130,12 @@ class StringTyperImpl {
   }
 
   void type(std::string_view string, const AddKey& add_key) const {
-    for (auto character : utf8_to_wide(string)) {
-
-      if (character == '\n')
-        character = '\r';
+    auto characters = utf8_to_wide(string);
+    replace_all<wchar_t>(characters, L"\\n", L"\r");
+    replace_all<wchar_t>(characters, L"\\r", L"\r");
+    replace_all<wchar_t>(characters, L"\\t", L"\t");
 
+    for (auto character : characters) {
       if (auto it = m_dictionary.find(character); it != m_dictionary.end()) {
         const auto& [dead_key, key] = it->second;
         if (dead_key.key != Key::none)

src/config/ParseConfig.cpp

@@ -408,28 +408,10 @@ std::string ParseConfig::preprocess(It it, const It end) const {
       if (!skip_until(&it, end, mark))
         error("Unterminated string");
 
-      // interpret escape sequence
-      auto prev = char{ };
-      std::for_each(begin, it, [&](char c) {
-        if (prev == '\\') {
-          c = [&]() {
-            switch (c) {
-              case 'n': return '\n';
-              case 't': return '\t';
-            }
-            result.push_back('\\');
-            return c;
-          }();
-          prev = { };
-        }
-        else {
-          prev = c;
-        }
-        result.push_back(c);
-      });
+      result.append(begin, it);
     }
     else {
-      // output single character
+      // single character
       result.append(begin, ++it);
     }
   }

src/config/StringTyper.h

@@ -26,3 +26,12 @@ class StringTyper {
 private:
   std::unique_ptr<class StringTyperImpl> m_impl;
 };
+
+template<typename T>
+void replace_all(std::basic_string<T>& str, std::basic_string_view<T> from, std::basic_string_view<T> to) {
+  auto start_pos = size_t{ };
+  while((start_pos = str.find(from, start_pos)) != std::basic_string<T>::npos) {
+    str.replace(start_pos, from.size(), to);
+    start_pos += to.size();
+  }
+}