blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

[termdesc] don't duplicate query defs, saves ~10KB of object size

Browse Source
This commit is contained in:
nick black 2022-01-19 12:27:39 -05:00
parent 8431910937
commit 437f24c92c
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/lib/termdesc.c
View File

@ -569,6 +569,8 @@ init_terminfo_esc(tinfo* ti, const char* name, escape_e idx,
// enter the alternate screen (smcup). we could technically get this from
// terminfo, but everyone who supports it supports it the same way, and we
// need to send it before our other directives if we're going to use it.
// we warn later in setup if what we get from terminfo doesn't match what
// we sent here.
#define SMCUP DECSET(SET_SMCUP)
#define RMCUP DECRST(SET_SMCUP)
@ -582,41 +584,38 @@ init_terminfo_esc(tinfo* ti, const char* name, escape_e idx,
static int
send_initial_queries(int fd, unsigned minimal, unsigned noaltscreen,
unsigned draininput){
const char *queries;
if(noaltscreen){
if(minimal){
if(draininput){
queries = DSRCPR DIRECTIVES;
}else{
queries = DSRCPR KKBDENTER DIRECTIVES;
}
}else{
if(draininput){
queries = DSRCPR IDQUERIES DIRECTIVES;
}else{
queries = DSRCPR KKBDENTER IDQUERIES DIRECTIVES;
}
}
}else{
if(minimal){
if(draininput){
queries = SMCUP DSRCPR DIRECTIVES;
}else{
queries = SMCUP DSRCPR KKBDENTER DIRECTIVES;
}
}else{
if(draininput){
queries = SMCUP DSRCPR IDQUERIES DIRECTIVES;
}else{
queries = SMCUP DSRCPR KKBDENTER IDQUERIES DIRECTIVES;
}
size_t total = 0;
// everything sends DSRCPR, and everything sends DIRECTIVES afterwards.
// we send KKBDENTER immediately before DIRECTIVES unless input is being
// drained. we send IDQUERIES unless minimal is set. we send SMCUP (as
// the first thing) unless noaltscreen is set.
if(!noaltscreen){
if(blocking_write(fd, SMCUP, strlen(SMCUP))){
return -1;
}
total += strlen(SMCUP);
}
size_t len = strlen(queries);
loginfo("sending %lluB", (unsigned long long)len);
if(blocking_write(fd, queries, len)){
if(blocking_write(fd, DSRCPR, strlen(DSRCPR))){
return -1;
}
total += strlen(DSRCPR);
if(!draininput){
if(blocking_write(fd, KKBDENTER, strlen(KKBDENTER))){
return -1;
}
total += strlen(KKBDENTER);
}
if(!minimal){
if(blocking_write(fd, IDQUERIES, strlen(IDQUERIES))){
return -1;
}
total += strlen(IDQUERIES);
}
if(blocking_write(fd, DIRECTIVES, strlen(DIRECTIVES))){
return -1;
}
total += strlen(DIRECTIVES);
loginfo("sent %" PRIuPTR "B", total);
return 0;
}