Skip to content

[terminfo] support the %'c' character constant #1744

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
tstack merged 2 commits into from
Aug 24, 2026
+59 −5
Merged

[terminfo] support the %'c' character constant #1744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c19b72
[terminfo] support the %'c' character constant
aspiers Aug 23, 2026
cf21cc9
[terminfo] gate stack ops on exec and drop the %'c' escape branch
tstack Aug 23, 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
64 changes: 59 additions & 5 deletions src/third-party/notcurses/src/lib/terminfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
break;
case 'p': {
int idx = p[1] - '1';
if (idx >= 0 && idx < argc) {
if (exec && idx >= 0 && idx < argc) {
if (argv[idx].type == TIPARM_INT) {
push(&stack,
(StackVal) {STK_INT, .i = argv[idx].i});
Expand All @@ -487,6 +487,24 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
argv[1].i++;
p++;
break;
case '\'': {
// %'c' pushes the literal character c. tic resolves
// backslash escapes when compiling the terminfo source, so
// the byte between the quotes is always the character
// itself, never an escape sequence.
p++;
int val = 0;
if (*p) {
val = (unsigned char) *p++;
}
if (*p == '\'') {
p++;
}
if (exec) {
push(&stack, (StackVal) {STK_INT, .i = val});
}
break;
}
case '{': {
p++;
int val = 0;
Expand All @@ -500,47 +518,73 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
}
if (*p == '}')
p++;
push(&stack, (StackVal) {STK_INT, .i = val * sign});
if (exec) {
push(&stack, (StackVal) {STK_INT, .i = val * sign});
}
break;
}
case '+': {
if (!exec) {
p++;
break;
}
StackVal b = pop(&stack), a = pop(&stack);
if (a.type == STK_INT && b.type == STK_INT)
push(&stack, (StackVal) {STK_INT, .i = a.i + b.i});
p++;
break;
}
case '-': {
if (!exec) {
p++;
break;
}
StackVal b = pop(&stack), a = pop(&stack);
if (a.type == STK_INT && b.type == STK_INT)
push(&stack, (StackVal) {STK_INT, .i = a.i - b.i});
p++;
break;
}
case '=': {
if (!exec) {
p++;
break;
}
StackVal b = pop(&stack), a = pop(&stack);
if (a.type == STK_INT && b.type == STK_INT)
push(&stack, (StackVal) {STK_INT, .i = (a.i == b.i)});
p++;
break;
}
case '<': {
if (!exec) {
p++;
break;
}
StackVal b = pop(&stack), a = pop(&stack);
if (a.type == STK_INT && b.type == STK_INT)
push(&stack, (StackVal) {STK_INT, .i = (a.i < b.i)});
p++;
break;
}
case '>': {
if (!exec) {
p++;
break;
}
StackVal b = pop(&stack), a = pop(&stack);
if (a.type == STK_INT && b.type == STK_INT)
push(&stack, (StackVal) {STK_INT, .i = (a.i > b.i)});
p++;
break;
}
case 'd': {
if (!exec) {
p++;
break;
}
StackVal v = pop(&stack);
if (exec && v.type == STK_INT) {
if (v.type == STK_INT) {
char numbuf[32];
snprintf(numbuf, sizeof(numbuf), "%d", v.i);
size_t len = strlen(numbuf);
Expand All @@ -555,8 +599,12 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
break;
}
case 's': {
if (!exec) {
p++;
break;
}
StackVal v = pop(&stack);
if (exec && v.type == STK_STR && v.s) {
if (v.type == STK_STR && v.s) {
size_t len = strlen(v.s);
if (out_len + len >= out_cap) {
while (out_len + len >= out_cap)
Expand All @@ -576,8 +624,14 @@ tiparm_s(const char* fmt, int argc, TiparmValue* argv)
p++;
break;
case 't': {
// the condition was only evaluated, and so only pushed, if
// this branch is live; exec stays false either way
if (!exec) {
p++;
break;
}
StackVal v = pop(&stack);
exec = exec && (v.type == STK_INT && v.i);
exec = (v.type == STK_INT && v.i);
if (exec) {
cond_execed = 1;
}
Expand Down
Loading