Merge pull request #1807 from contour-terminal/fix/fish-shell-CSIu

Adapts CSIu input protocol to match how recent fish shell implementation transmits it.

Author: christianparpart

metainfo.xml

@@ -120,6 +120,7 @@
           <li>Fixes double line box drawing characters</li>
           <li>Fixes DECRQM (DEC Request Mode) response (#1797)</li>
           <li>Fixes Precondition failure when rendering vertically overflowing glyphs (#1805)</li>
+          <li>Fixes fish-shell keyboard input protocol behaviour; acting as if it would be broken on e.g. control keys (weird handling of CSIu input protocol)</li>
           <li>Enables customizing predefined color palette (#1763)</li>
           <li>Ensure inserting new tabs happens right next to the currently active tab (#1695)</li>
           <li>Allow glyphs to underflow if they are not bigger than the cell size (#1603)</li>

src/vtbackend/Functions.h

@@ -517,7 +517,7 @@ constexpr inline auto CHA         = detail::CSI(std::nullopt, 0, 1, std::nullopt
 constexpr inline auto CHT         = detail::CSI(std::nullopt, 0, 1, std::nullopt, 'I', VTType::VT100, documentation::CHT);
 constexpr inline auto CNL         = detail::CSI(std::nullopt, 0, 1, std::nullopt, 'E', VTType::VT100, documentation::CNL);
 constexpr inline auto CPL         = detail::CSI(std::nullopt, 0, 1, std::nullopt, 'F', VTType::VT100, documentation::CPL);
-constexpr inline auto CSIUENHCE   = detail::CSI('=', 1, 2, std::nullopt, 'u', VTExtension::Unknown, documentation::CSIUENHCE);
+constexpr inline auto CSIUENHCE   = detail::CSI('=', 0, 2, std::nullopt, 'u', VTExtension::Unknown, documentation::CSIUENHCE);
 constexpr inline auto CSIUENTER   = detail::CSI('>', 0, 1, std::nullopt, 'u', VTExtension::Unknown, documentation::CSIUENTER);
 constexpr inline auto CSIULEAVE   = detail::CSI('<', 0, 1, std::nullopt, 'u', VTExtension::Unknown, documentation::CSIULEAVE);
 constexpr inline auto CSIUQUERY   = detail::CSI('?', 0, 0, std::nullopt, 'u', VTExtension::Unknown, documentation::CSIUQUERY);

src/vtbackend/Screen.cpp

@@ -3636,10 +3636,9 @@ ApplyResult Screen<Cell>::apply(Function const& function, Sequence const& seq)
             return ApplyResult::Ok;
         }
         case CSIUENHCE: {
-            auto const flags = KeyboardEventFlags::from_value(seq.param_or(0, 1));
+            // Defaulting flags to 0. (Seems not to be documented by the spec, but Fish shell is doing that!)
+            auto const flags = KeyboardEventFlags::from_value(seq.param_or(0, 0));
             auto const mode = seq.param_or(1, 1);
-            if (_terminal->keyboardProtocol().stackDepth() <= 1)
-                return ApplyResult::Invalid;
             switch (mode)
             {
                 case 1: _terminal->keyboardProtocol().flags() = flags; return ApplyResult::Ok;