mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'decrqss'

Browse source 
Closes #798
This commit is contained in:
Daniel Eklöf 2022-01-14 13:52:58 +01:00
commit f048e08f10
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 185 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -49,6 +49,13 @@
* `XTGETTCAP` - builtin terminfo. See
[README.md::XTGETTCAP](README.md#xtgettcap) for details
(https://codeberg.org/dnkl/foot/issues/846).
* `DECRQSS` - _Request Selection or Setting_
(https://codeberg.org/dnkl/foot/issues/798). Implemented settings
are:
- `DECSTBM` - _Set Top and Bottom Margins_
- `SGR` - _Set Graphic Rendition_
- `DECSCUSR` - _Set Cursor Style_
### Changed

175
dcs.c
View file

@ -213,6 +213,173 @@ xtgettcap_unhook(struct terminal *term)
}
}
static void
decrqss(struct terminal *term)
{
const uint8_t *query = term->vt.dcs.data;
const size_t n = term->vt.dcs.idx;
/*
* A note on the Ps parameter in the reply: many DEC manual
* instances (e.g. https://vt100.net/docs/vt510-rm/DECRPSS) claim
* that 0 means “request is valid”, and 1 means “request is
* invalid”.
*
* However, this appears to be a typo; actual hardware inverts the
* response (as does XTerm and mlterm):
* https://github.com/hackerb9/vt340test/issues/13
*/
if (memcmp(query, "r", n) == 0) {
/* DECSTBM - Set Top and Bottom Margins */
char reply[64];
int len = snprintf(reply, sizeof(reply), "\033P1$r%d;%dr\033\\",
term->scroll_region.start + 1,
term->scroll_region.end);
term_to_slave(term, reply, len);
}
else if (memcmp(query, "m", n) == 0) {
/* SGR - Set Graphic Rendition */
char *reply = NULL;
size_t len = 0;
#define append_attr_n(str, l) do { \
size_t new_len = len + l + 1; \
reply = xrealloc(reply, new_len); \
memcpy(&reply[len], str, l); \
reply[new_len - 1] = ';'; \
len = new_len; \
} while (0)
#define append_attr(num_as_str) \
append_attr_n(num_as_str, sizeof(num_as_str) - 1)
/* Always present, both in the example from the VT510 manual
* (https://vt100.net/docs/vt510-rm/DECRPSS), and in XTerm and
* mlterm */
append_attr("0");
struct attributes *a = &term->vt.attrs;
if (a->bold)
append_attr("1");
if (a->dim)
append_attr("2");
if (a->italic)
append_attr("3");
if (a->underline)
append_attr("4");
if (a->blink)
append_attr("5");
if (a->reverse)
append_attr("7");
if (a->conceal)
append_attr("8");
if (a->strikethrough)
append_attr("9");
switch (a->fg_src) {
case COLOR_DEFAULT:
break;
case COLOR_BASE16: {
char value[4];
int val_len = snprintf(
value, sizeof(value), "%u",
a->fg >= 8 ? a->fg - 8 + 90 : a->fg + 30);
append_attr_n(value, val_len);
break;
}
case COLOR_BASE256: {
char value[16];
int val_len = snprintf(value, sizeof(value), "38:5:%u", a->fg);
append_attr_n(value, val_len);
break;
}
case COLOR_RGB: {
uint8_t r = a->fg >> 16;
uint8_t g = a->fg >> 8;
uint8_t b = a->fg >> 0;
char value[32];
int val_len = snprintf(
value, sizeof(value), "38:2::%hhu:%hhu:%hhu", r, g, b);
append_attr_n(value, val_len);
break;
}
}
switch (a->bg_src) {
case COLOR_DEFAULT:
break;
case COLOR_BASE16: {
char value[4];
int val_len = snprintf(
value, sizeof(value), "%u",
a->bg >= 8 ? a->bg - 8 + 100 : a->bg + 40);
append_attr_n(value, val_len);
break;
}
case COLOR_BASE256: {
char value[16];
int val_len = snprintf(value, sizeof(value), "48:5:%u", a->bg);
append_attr_n(value, val_len);
break;
}
case COLOR_RGB: {
uint8_t r = a->bg >> 16;
uint8_t g = a->bg >> 8;
uint8_t b = a->bg >> 0;
char value[32];
int val_len = snprintf(
value, sizeof(value), "48:2::%hhu:%hhu:%hhu", r, g, b);
append_attr_n(value, val_len);
break;
}
}
#undef append_attr
#undef append_attr_n
reply[len - 1] = 'm';
term_to_slave(term, "\033P1$r", 5);
term_to_slave(term, reply, len);
term_to_slave(term, "\033\\", 2);
free(reply);
}
else if (memcmp(query, " q", n) == 0) {
/* DECSCUSR - Set Cursor Style */
int mode;
switch (term->cursor_style) {
case CURSOR_BLOCK: mode = 2; break;
case CURSOR_UNDERLINE: mode = 4; break;
case CURSOR_BEAM: mode = 6; break;
default: BUG("invalid cursor style"); break;
}
if (term->cursor_blink.deccsusr)
mode--;
char reply[16];
int len = snprintf(reply, sizeof(reply), "\033P1$r%d q\033\\", mode);
term_to_slave(term, reply, len);
}
else {
const char err[] = "\033P0$r\033\\";
term_to_slave(term, err, sizeof(err) - 1);
}
}
void
dcs_hook(struct terminal *term, uint8_t final)
{
@ -240,6 +407,14 @@ dcs_hook(struct terminal *term, uint8_t final)
}
break;
case '$':
switch (final) {
case 'q':
term->vt.dcs.unhook_handler = &decrqss;
break;
}
break;
case '=':
switch (final) {
case 's':

3
doc/foot-ctlseqs.7.scd
View file

@ -675,6 +675,9 @@ and are terminated by *\\E\\* (ST).
:[ *Description*
| \\EP q <sixel data> \\E\\
: Emit a sixel image at the current cursor position
| \\P $ q <query> \\E\\
: Request selection or setting (DECRQSS). Implemented queries:
DECSTBM, SGR and DECSCUSR.
| \\EP = 1 s \\E\\
: Begin application synchronized updates
| \\EP = 2 s \\E\\