Skip to content

Fix line input mode when preprocessing is disabled #886

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
o-sdn-o merged 4 commits into from
Mar 5, 2026
Merged

Fix line input mode when preprocessing is disabled #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b89273
Fix the disabled input preprocessing in cooked mode (Ctrl+Z in ReadFile)
o-sdn-o Mar 5, 2026
ba89e76
Fix OSC 10/11 request; Drop '/config/terminal/colors/bground'
o-sdn-o Mar 5, 2026
7ac8eec
Fix built-in terminal palette ('/config/terminal/colors/color*'; OSC …
o-sdn-o Mar 5, 2026
3f1aa92
v2026.03.05
o-sdn-o Mar 5, 2026
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
3 changes: 1 addition & 2 deletions doc/settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,7 @@ Notes
<color13 = magentalt />
<color14 = cyanlt />
<color15 = whitelt />
<default fgc=whitedk bgc=pureblack/> <!-- Default terminal colors (SGR 39/49). -->
<bground = DefaultColor/> <!-- Background color of the scrollback canvas. Set to 0x00ffffff or DefaultColor to sync with the default SGR 49 background. -->
<default fgc=whitedk bgc=pureblack/> <!-- Default terminal colors (SGR 39/49, set by OSC 10/11). -->
<match fx="color" fgc=whitelt bgc= #007F00/> <!-- Appearance of selected text matches. Available shaders (fx): "xlight", "color", "invert", "reverse". -->
<selection>
<text fx="color" fgc=whitelt bgc=bluelt/> <!-- Selection highlighting for plaintext clipboard mode. -->
Expand Down
2 changes: 1 addition & 1 deletion src/netxs/desktopio/application.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace netxs::app

namespace netxs::app::shared
{
static const auto version = "v2026.03.04";
static const auto version = "v2026.03.05";
static const auto repository = "https://github.com/directvt/vtm";
static const auto usr_config = "~/.config/vtm/settings.xml"s;
static const auto sys_config = "/etc/vtm/settings.xml"s;
Expand Down
17 changes: 12 additions & 5 deletions src/netxs/desktopio/canvas.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,11 +759,18 @@ namespace netxs
});
friend auto& operator << (std::ostream& s, argb c)
{
return s << "{" << (si32)c.chan.r
<< "," << (si32)c.chan.g
<< "," << (si32)c.chan.b
<< "," << (si32)c.chan.a
<< "}";
if (auto index = argb::is_indexed_color(c))
{
return s << "Color" << index - 1;
}
else
{
return s << "{" << (si32)c.chan.r
<< "," << (si32)c.chan.g
<< "," << (si32)c.chan.b
<< "," << (si32)c.chan.a
<< "}";
}
}
static auto set_vtm16_palette(auto proc)
{
Expand Down
2 changes: 1 addition & 1 deletion src/netxs/desktopio/consrv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2905,7 +2905,7 @@ struct impl : consrv
if constexpr (RawRead)
{
log("\tread mode: raw ReadFile emulation");
packet.input = { .EOFon = 1 };
packet.input = { .EOFon = inpmod & nt::console::inmode::preprocess }; // Disabling input preprocessing in cooked mode enables line buffering, allowing the application to intercept (ReadFile) and process Ctrl+Z as raw data.
}
auto namesize = (ui32)(packet.input.execb * sizeof(wchr));
if (!size_check(packet.echosz, packet.input.affix)
Expand Down
45 changes: 29 additions & 16 deletions src/netxs/desktopio/terminal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ namespace netxs::ui
cell def_curclr;
argb def_fcolor;
argb def_bcolor;
argb def_filler;
si32 def_selmod;
si32 def_cursor;
bool def_selalt;
Expand All @@ -253,6 +252,7 @@ namespace netxs::ui
bool allow_logs;
span def_period;
pals def_colors;
pals bkp_colors;

cell def_safe_c;
cell def_ansi_c;
Expand Down Expand Up @@ -327,7 +327,6 @@ namespace netxs::ui
def_atexit = config.settings::take("/config/terminal/atexit", commands::atexit::smart, atexit_options);
def_fcolor = config.settings::take("/config/terminal/colors/default/fgc", argb{ whitelt });
def_bcolor = config.settings::take("/config/terminal/colors/default/bgc", argb{ blackdk });
def_filler = config.settings::take("/config/terminal/colors/bground", argb{ argb::default_color });

def_safe_c = config.settings::take("/config/terminal/colors/selection/protected", cell{}.bgc(bluelt) .fgc(whitelt));
def_ansi_c = config.settings::take("/config/terminal/colors/selection/ansi", cell{}.bgc(bluelt) .fgc(whitelt));
Expand Down Expand Up @@ -359,8 +358,9 @@ namespace netxs::ui
std::copy(std::begin(argb::vt256), std::end(argb::vt256), std::begin(def_colors));
for (auto i = 0; i < 16; i++)
{
def_colors[i] = config.settings::take("/config/terminal/colors/color" + std::to_string(i), def_colors[i]);
def_colors[i] = netxs::letoh(config.settings::take("/config/terminal/colors/color" + std::to_string(i), argb{ def_colors[i] }).token); // Store colors as integers.
}
bkp_colors = def_colors;
}
};

Expand Down Expand Up @@ -866,8 +866,15 @@ namespace netxs::ui
utf::trim_front_if(data, [](char c){ return c >= '0' && c <= '9'; });
if (auto v = utf::to_int(data))
{
auto n = std::clamp(v.value(), 0, 255);
color[n] = argb::vt256[n];
auto n = v.value();
if (n < 0 || n > 255)
{
log("%%Unsupported 256-color palette index %%", prompt::term, n);
}
else
{
color[n] = owner.defcfg.bkp_colors[n]; // Restore color from settings.
}
empty = faux;
}
}
Expand All @@ -883,9 +890,13 @@ namespace netxs::ui
if (data.empty()) break;
if (auto v = utf::to_int(data))
{
auto n = std::clamp(v.value(), 0, 255);
auto n = v.value();
auto [t, r] = record(data);
if (t == type::request)
if (n < 0 || n > 255)
{
log("%%Unsupported 256-color palette index %%", prompt::term, n);
}
else if (t == type::request)
{
auto c = argb{ color[n] };
reply.osc(ansi::osc_set_palette, utf::fprint("%n%;rgb:%r%/%g%/%b%", n, utf::to_hex(c.chan.r),
Expand Down Expand Up @@ -920,7 +931,7 @@ namespace netxs::ui
auto [t, r] = record(data);
if (t == type::request)
{
auto c = owner.target->brush.sfg();
auto c = owner.defclr.fgc();
reply.osc(ansi::osc_set_fgcolor, utf::fprint("rgb:%r%/%g%/%b%", utf::to_hex(c.chan.r),
utf::to_hex(c.chan.g),
utf::to_hex(c.chan.b)));
Expand All @@ -939,7 +950,7 @@ namespace netxs::ui
auto [t, r] = record(data);
if (t == type::request)
{
auto c = owner.target->brush.sbg();
auto c = owner.defclr.bgc();
reply.osc(ansi::osc_set_bgcolor, utf::fprint("rgb:%r%/%g%/%b%", utf::to_hex(c.chan.r),
utf::to_hex(c.chan.g),
utf::to_hex(c.chan.b)));
Expand Down Expand Up @@ -975,11 +986,15 @@ namespace netxs::ui
};
procs[ansi::osc_reset_fgclr] = [&](view /*data*/)
{
owner.defclr.fgc(owner.defcfg.def_fcolor);
auto new_fgc = owner.defclr;
new_fgc.fgc(owner.defcfg.def_fcolor);
owner.set_color(new_fgc);
};
procs[ansi::osc_reset_bgclr] = [&](view /*data*/ )
{
owner.defclr.bgc(owner.defcfg.def_bcolor);
auto new_bgc = owner.defclr;
new_bgc.bgc(owner.defcfg.def_bcolor);
owner.set_color(new_bgc);
};
}

Expand Down Expand Up @@ -9076,9 +9091,7 @@ namespace netxs::ui
auto full = parent_canvas.full();
auto original_cursor = console.get_coord(origin); // base::coor() and origin are the same.

auto brush = defclr;
if (defcfg.def_filler != argb::default_color) brush.bgc(defcfg.def_filler); // Unsync with SGR default background.
parent_canvas.fill(cell::shaders::fusefull(brush));
parent_canvas.fill(cell::shaders::fusefull(defclr));

if (ime_on) // Draw IME composition overlay.
{
Expand Down Expand Up @@ -9106,7 +9119,7 @@ namespace netxs::ui
viewport_square.coor -= origin;
if (auto context2D = parent_canvas.change_basis(viewport_square))
{
parent_canvas.output<faux>(imebox, viewport_cursor, cell::shaders::mimic(brush));
parent_canvas.output<faux>(imebox, viewport_cursor, cell::shaders::mimic(defclr));
}
composit_cursor -= origin; // Convert to original (scrollback based) basis.
caret.coor(composit_cursor);
Expand All @@ -9121,7 +9134,7 @@ namespace netxs::ui
else
{
caret.coor(original_cursor);
if (brush.bga() != 0xFF) parent_canvas.fill(rect{ caret.coor(), dot_11 }, [&](cell& c){ c.fgc(console.brush.fgc()); }); // Prefill the cursor cell placeholder in the case of transparent background.
if (defclr.bga() != 0xFF) parent_canvas.fill(rect{ caret.coor(), dot_11 }, [&](cell& c){ c.fgc(console.brush.fgc()); }); // Prefill the cursor cell placeholder in the case of transparent background.
console.output(parent_canvas);
}
if (invert) parent_canvas.fill(cell::shaders::invbit);
Expand Down
3 changes: 1 addition & 2 deletions src/vtm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ R"==(
<color13 = magentalt />
<color14 = cyanlt />
<color15 = whitelt />
<default fgc=whitedk bgc=pureblack/> <!-- Default terminal colors (SGR 39/49). -->
<bground = DefaultColor/> <!-- Background color of the scrollback canvas. Set to 0x00ffffff or DefaultColor to sync with the default SGR 49 background. -->
<default fgc=whitedk bgc=pureblack/> <!-- Default terminal colors (SGR 39/49, set by OSC 10/11). -->
<match fx="color" fgc=whitelt bgc= #007F00/> <!-- Appearance of selected text matches. Available shaders (fx): "xlight", "color", "invert", "reverse". -->
<selection>
<text fx="color" fgc=whitelt bgc=bluelt/> <!-- Selection highlighting for plaintext clipboard mode. -->
Expand Down