Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2025
+4 −4
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/vtbackend/Functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions src/vtbackend/Screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading