Skip to content
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

Fix PowerShell input echo on Windows #582

Merged
merged 6 commits into from
Apr 5, 2024
Merged

Fix PowerShell input echo on Windows #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d775ef
Move cursor rendering to the top level
o-sdn-o Apr 2, 2024
f039d76
Background interpolation with neighbor cells
o-sdn-o Apr 2, 2024
50fe220
Background interpolation with neighbor cells
o-sdn-o Apr 2, 2024
48a1587
Don't touch format codepoints (Cf)
o-sdn-o Apr 4, 2024
8ca5eb4
#581: Set font-family to TTF in GetCurrentConsoleFontEx reply
o-sdn-o Apr 5, 2024
e0348df
v0.9.77
o-sdn-o Apr 5, 2024
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
19 changes: 9 additions & 10 deletions src/netxs/desktopio/ansivt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,11 @@ namespace netxs::ansi
{
if (state.wdt() == 2)
{
if (state.scan<svga::vtrgb, UseSGR>(c, state, block)) state.set_gc(); // Cleanup used t
if (state.check_pair(c))
{
state.scan<svga::vtrgb, UseSGR>(state, block);
state.set_gc(); // Cleanup used t
}
else
{
badfx(); // Left part alone
Expand Down Expand Up @@ -1106,15 +1110,10 @@ namespace netxs::ansi
changer setter = {};
marker()
{
setter[ctrl::alm ] = [](cell& p){ p.rtl(true); };
setter[ctrl::rlm ] = [](cell& p){ p.rtl(true); };
setter[ctrl::lrm ] = [](cell& p){ p.rtl(faux); };
setter[ctrl::shy ] = [](cell& p){ p.hyphen(true); };
setter[ctrl::function_application] = [](cell& p){ p.fnappl(true); };
setter[ctrl::invisible_times ] = [](cell& p){ p.itimes(true); };
setter[ctrl::invisible_separator ] = [](cell& p){ p.isepar(true); };
setter[ctrl::invisible_plus ] = [](cell& p){ p.inplus(true); };
setter[ctrl::zwnbsp ] = [](cell& p){ p.zwnbsp(true); };
setter[ctrl::alm ] = [](cell& p){ p.rtl(true); };
setter[ctrl::rlm ] = [](cell& p){ p.rtl(true); };
setter[ctrl::lrm ] = [](cell& p){ p.rtl(faux); };
//setter[ctrl::shy ] = [](cell& p){ p.hyphen(); };
}
};

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 @@ -23,7 +23,7 @@ namespace netxs::app

namespace netxs::app::shared
{
static const auto version = "v0.9.76";
static const auto version = "v0.9.77";
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
150 changes: 98 additions & 52 deletions src/netxs/desktopio/canvas.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ namespace netxs
if (utf8.empty()) token = 0;
else
{
auto cluster = utf::letter(utf8);
auto cluster = utf::cluster(utf8);
set(cluster.text, cluster.attr.ucwidth);
}
}
Expand Down Expand Up @@ -1077,6 +1077,13 @@ namespace netxs
// weigth := 0..255
// italic := 0..255
//
struct pxtype
{
static constexpr auto none = 0;
static constexpr auto colors = 1; // rgba colors pair (cursor/grid/whatever).
static constexpr auto bitmap = 2; // Attached rgba bitmap reference: First 32 bit: bitmap index. Last 32 bit: offset inside bitmap.
static constexpr auto reserved = 3;
};
struct attr
{
// Shared attributes.
Expand All @@ -1087,23 +1094,30 @@ namespace netxs
ui32 strike : 1;
ui32 unline : 3; // 0: none, 1: line, 2: biline, 3: wavy, 4: dotted, 5: dashed, 6 - 7: unknown.
ui32 ucolor : 8; // Underline 256-color 6x6x6-cube index. Alpha not used - it is shared with fgc alpha. If zero - sync with fgc.
ui32 cursor : 3; // 0: None, 1: Underline, 2: Block, 3: I-bar, 7: Transparent - hint for IME.
ui32 cursor : 3; // 0: None, 1: Underline, 2: Block, 3: I-bar, 7: Transparent - hint for IME. cell::px stores cursor fg/bg if cursor is set.
ui32 blinks : 1;
ui32 bitmap : 1; // Attached rgba bitmap (cursor/grid/whatever). Temp: cell::px stores cursor fg/bg if cursor!=0. Todo: draw cursor over attached bitmap if it is.
ui32 bit_reserv : 3;

//todo ui32 fragment : 8; // 8 bit for CFA
ui32 bitmap : 2; // body::pxtype: Cursor losts its colors when it covers bitmap.
ui32 fusion : 2; // Background interpolation current c0 with neighbor c1 and c2 cells:
//
// c0 c1
// c2
// BG interpolation type (two 1-bit values):
// 0 -- None
// 1 -- Cubic
//
// 0 1
// │ └────── interpolation type between `c0` and `c2`
// └──────── interpolation type between `c0` and `c1`
//todo Cf's can not be entered: even using paste from clipboard
//dont show (drop) Cf's but allow input it in any order (app is responsible to show it somehow)

//todo application context: word delimeters (use it in a word/line wrapping, check the last codepoint != Cf | Spc):
// append prev: U+200C ZERO WIDTH NON-JOINER
// append prev: U+00AD SOFT HYPHEN

// Unique attributes. From 24th bit.
//todo move all to cell::na
//ui32 r_to_l : 1;
ui32 hyphen : 1;
ui32 fnappl : 1;
ui32 itimes : 1;
ui32 isepar : 1;
ui32 inplus : 1;
ui32 zwnbsp : 1;
ui32 reserv : 2; // reserved
//todo ui32 fragment : 8; // 8 bit for CFA
ui32 reserv : 8;
};

ui32 token;
Expand Down Expand Up @@ -1175,6 +1189,7 @@ namespace netxs
void itc(bool b) { attrs.italic = b; }
void und(si32 n) { attrs.unline = n; }
void unc(si32 c) { attrs.ucolor = c; }
void cur(si32 s) { attrs.cursor = s; }
void inv(bool b) { attrs.invert = b; }
void ovr(bool b) { attrs.overln = b; }
void stk(bool b) { attrs.strike = b; }
Expand All @@ -1185,6 +1200,7 @@ namespace netxs
bool itc() const { return attrs.italic; }
si32 und() const { return attrs.unline; }
si32 unc() const { return attrs.ucolor; }
si32 cur() const { return attrs.cursor; }
bool inv() const { return attrs.invert; }
bool ovr() const { return attrs.overln; }
bool stk() const { return attrs.strike; }
Expand Down Expand Up @@ -1578,35 +1594,10 @@ namespace netxs
else dest += whitespace;
}
}
// cell: !!! Ensure that this.wdt == 2 and the next wdt == 3 and they are the same.
template<svga Mode = svga::vtrgb, bool UseSGR = true, class T>
bool scan(cell const& next, cell& base, T& dest) const
// cell: Check that the halves belong to the same wide glyph.
bool check_pair(cell const& next) const
{
if constexpr (Mode == svga::dtvt) return {};
if (gc.same(next.gc) && like(next))
{
if (!like(base))
{
//todo additionally consider UNIQUE ATTRIBUTES
uv.get<Mode, UseSGR>(base.uv, dest);
st.get<Mode, UseSGR>(base.st, dest);
//if constexpr (Mode == svga::vtrgb && UseSGR) // Use colored grid only in vtrgb mode.
//{
//todo raw bitmap
// if (base.gridcolor != gridcolor)
// {
// dest.grd(gridcolor);
// base.gridcolor = gridcolor;
// }
//}
}
filter<Mode, UseSGR>(base, dest);
return true;
}
else
{
return faux;
}
return gc.same(next.gc) && like(next);
}
// cell: Convert to text. Ignore right half. Convert binary clusters (eg: ^C -> 0x03).
void scan(text& dest) const
Expand Down Expand Up @@ -1719,6 +1710,7 @@ namespace netxs
auto& und(si32 n) { st.und(n); return *this; } // cell: Set Underline attribute.
auto& unc(rgba c) { st.unc(c.to_256cube()); return *this; } // cell: Set Underline color.
auto& unc(si32 c) { st.unc(c); return *this; } // cell: Set Underline color.
auto& cur(si32 s) { st.cur(s); return *this; } // cell: Set cursor style.
auto& img(ui64 p) { px.token = p; return *this; } // cell: Set attached bitmap.
auto& ovr(bool b) { st.ovr(b); return *this; } // cell: Set Overline attribute.
auto& inv(bool b) { st.inv(b); return *this; } // cell: Set Invert attribute.
Expand All @@ -1744,12 +1736,6 @@ namespace netxs
return *this;
}

void hyphen(bool b) { st.attrs.hyphen = b; } // cell: Set the presence of the SOFT HYPHEN (U+00AD).
void fnappl(bool b) { st.attrs.fnappl = b; } // cell: Set the presence of the FUNCTION APPLICATION (U+2061).
void itimes(bool b) { st.attrs.itimes = b; } // cell: Set the presence of the INVISIBLE TIMES (U+2062).
void isepar(bool b) { st.attrs.isepar = b; } // cell: Set the presence of the INVISIBLE SEPARATOR (U+2063).
void inplus(bool b) { st.attrs.inplus = b; } // cell: Set the presence of the INVISIBLE PLUS (U+2064).
void zwnbsp(bool b) { st.attrs.zwnbsp = b; } // cell: Set the presence of the ZERO WIDTH NO-BREAK SPACE (U+FEFF).

auto tkn() const { return gc.tkn(); } // cell: Return grapheme cluster token.
bool jgc() const { return gc.jgc(); } // cell: Check the grapheme cluster registration (foreign jumbo clusters).
Expand All @@ -1769,6 +1755,7 @@ namespace netxs
auto itc() const { return st.itc(); } // cell: Return Italic attribute.
auto und() const { return st.und(); } // cell: Return Underline/Underscore attribute.
auto unc() const { return st.unc(); } // cell: Return Underline color.
auto cur() const { return st.cur(); } // cell: Return cursor style.
auto& img() { return px.token; } // cell: Return attached bitmap.
auto& img() const { return px.token; } // cell: Return attached bitmap.
auto ovr() const { return st.ovr(); } // cell: Return Overline attribute.
Expand Down Expand Up @@ -1799,6 +1786,21 @@ namespace netxs
}
return faux;
}
auto set_cursor(si32 style, cell color = {})
{
st.cur(style);
if (st.attrs.bitmap != body::pxtype::bitmap && (color.uv.bg.token || color.uv.fg.token))
{
st.attrs.bitmap = body::pxtype::colors;
px.token = ((ui64)color.uv.bg.token << 32) | (ui64)color.uv.fg.token;
}
}
auto cursor_color()
{
auto colored = st.attrs.bitmap == body::pxtype::colors;
return colored ? std::pair{ rgba{ (ui32)(px.token >> 32) }, rgba{ (ui32)(px.token & 0xFFFF'FFFF) }}
: std::pair{ rgba{}, rgba{} };
}
// cell: Return whitespace cell.
cell spc() const
{
Expand Down Expand Up @@ -2065,6 +2067,50 @@ namespace netxs
static constexpr auto invbit = invbit_t{};
static constexpr auto disabled = disabled_t{};
};

auto draw_cursor()
{
auto [cursor_bgc, cursor_fgc] = cursor_color();
switch (st.cur())
{
case text_cursor::block:
if (cursor_bgc.chan.a == 0)
{
auto b = inv() ? fgc() : bgc();
auto f = cursor_fgc.chan.a ? cursor_fgc : b;
inv(faux).fgc(f).bgc(cell::shaders::contrast.invert(b));
}
else
{
auto b = cursor_bgc;
auto f = cursor_fgc.chan.a ? cursor_fgc : cell::shaders::contrast.invert(b);
inv(faux).fgc(f).bgc(b);
}
break;
case text_cursor::I_bar:
case text_cursor::underline:
if (cursor_bgc.chan.a == 0)
{
if (und() == unln::line)
{
und(unln::none);
}
else
{
auto b = inv() ? fgc() : bgc();
auto u = rgba{ cell::shaders::contrast.invert(b) };
und(unln::line).unc(u);
}
}
else
{
auto u = cursor_bgc.to_256cube();
if (u == unc() && und() == unln::line) und(unln::none);
else und(unln::line).unc(u);
}
break;
}
}
};

enum class bias : unsigned char { none, left, right, center, };
Expand Down Expand Up @@ -2436,7 +2482,7 @@ namespace netxs
auto alpha = [&](auto txt)
{
//todo revise (https://unicode.org/reports/tr29/#Word_Boundaries)
auto c = utf::letter(txt).attr.cdpoint;
auto c = utf::cluster<true>(txt).attr.cdpoint;
return (c >= '0' && c <= '9')//30-39: '0'-'9'
||(c >= '@' && c <= 'Z')//40-5A: '@','A'-'Z'
||(c >= 'a' && c <= 'z')//5F,61-7A: '_','a'-'z'
Expand Down Expand Up @@ -2465,14 +2511,14 @@ namespace netxs
};
auto is_digit = [&](auto txt)
{
auto c = utf::letter(txt).attr.cdpoint;
auto c = utf::cluster(txt).attr.cdpoint;
return (c >= '0' && c <= '9')
||(c >= 0xFF10 && c <= 0xFF19) // U+FF10 (０) FULLWIDTH DIGIT ZERO - U+FF19 (９) FULLWIDTH DIGIT NINE
|| c == '.';
};
auto digit = [&](auto txt)
{
auto c = utf::letter(txt).attr.cdpoint;
auto c = utf::cluster(txt).attr.cdpoint;
return c == '.'
||(c >= 'a' && c <= 'f')
||(c >= 'A' && c <= 'F')
Expand Down
7 changes: 3 additions & 4 deletions src/netxs/desktopio/consrv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@ struct impl : consrv
{
auto active = scroll_handle.link == &uiterm.target || scroll_handle.link == uiterm.target; // Target buffer can be changed during vt execution (eg: switch to altbuf).
if (!direct(packet.target, [&](auto& scrollback){ active ? uiterm.ondata(crop)
: uiterm.ondata(crop, &scrollback); }))
: uiterm.ondata(crop, &scrollback); }))
{
datasize = 0;
}
Expand All @@ -3074,8 +3074,7 @@ struct impl : consrv
{
uiterm.ondata(crop);
}
log("\t", show_page(packet.input.utf16, codec.codepage),
": ", ansi::hi(utf::debase<faux, faux>(crop)));
log("\t", show_page(packet.input.utf16, codec.codepage), ": ", ansi::hi(utf::debase<faux, faux>(crop)));
scroll_handle.toUTF8.erase(0, crop.size()); // Delete processed data.
}
else
Expand Down Expand Up @@ -4474,7 +4473,7 @@ struct impl : consrv
packet.reply.index = 0;
packet.reply.sizex = 10;
packet.reply.sizey = 20;
packet.reply.pitch = 0;
packet.reply.pitch = TMPF_TRUETYPE; // Pwsh checks this to decide whether or not to switch to UTF-8. For raster fonts (non-Unicode), the low-order bits are set to zero.
packet.reply.heavy = 0;
auto brand = L"Consolas"s + L'\0';
std::copy(std::begin(brand), std::end(brand), std::begin(packet.reply.brand));
Expand Down
Loading