Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-04 06:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

move Windows SetConsoleMode() to before queries #2062

Browse Source
This commit is contained in:
nick black 2021-08-24 06:09:55 -04:00
parent bb053e82e3
commit 890310abf8
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
3 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/lib/input.c
View File

@ -1590,60 +1590,45 @@ int ncinputlayer_init(tinfo* tcache, FILE* infp, queried_terminals_e* detected,
nilayer->user_wants_data = false;
nilayer->inner_wants_data = false;
pthread_cond_init(&nilayer->creport_cond, NULL);
#ifdef __MINGW64__
HANDLE in = GetStdHandle(STD_INPUT_HANDLE);
if(in == INVALID_HANDLE_VALUE){
logerror("couldn't get input handle\n");
return -1;
}
// if we're a true Windows Terminal, SetConsoleMode() ought succeed.
// otherwise, we're something else; go ahead and query.
if(SetConsoleMode(in, ENABLE_MOUSE_INPUT
| ENABLE_VIRTUAL_TERMINAL_INPUT
| ENABLE_PROCESSED_INPUT
| ENABLE_WINDOW_INPUT)){
loginfo("prepared Windows Terminal\n");
return 0;
}
logerror("couldn't set input console mode\n");
#endif
// windows terminal doesn't seem to reply to any queries =/
int csifd = nilayer->ttyfd >= 0 ? nilayer->ttyfd : nilayer->infd;
if(isatty(csifd)){
query_state inits = {
.tcache = tcache,
.state = STATE_NULL,
.qterm = *detected,
.cursor_x = -1,
.cursor_y = -1,
};
if(control_read(csifd, &inits)){
input_free_esctrie(&nilayer->inputescapes);
free(inits.version);
pthread_cond_destroy(&nilayer->creport_cond);
pthread_mutex_destroy(&nilayer->lock);
return -1;
}
tcache->bg_collides_default = inits.bg;
tcache->termversion = inits.version;
*detected = inits.qterm;
*appsync = inits.appsync;
if(cursor_x){
*cursor_x = inits.cursor_x - 1;
}
if(cursor_y){
*cursor_y = inits.cursor_y - 1;
}
if(inits.pixelwidth && inits.pixelheight){
tcache->pixy = inits.pixelheight;
tcache->pixx = inits.pixelwidth;
}
if(inits.kittygraphics){ // kitty trumps sixel
loginfo("advertised kitty; disabling sixel\n");
tcache->color_registers = 0;
tcache->sixel_maxx = 0;
tcache->sixel_maxy = 0;
*kittygraphs = true;
if(*detected != TERMINAL_MSTERMINAL){
// windows terminal doesn't seem to reply to any queries =/
int csifd = nilayer->ttyfd >= 0 ? nilayer->ttyfd : nilayer->infd;
if(isatty(csifd)){
query_state inits = {
.tcache = tcache,
.state = STATE_NULL,
.qterm = *detected,
.cursor_x = -1,
.cursor_y = -1,
};
if(control_read(csifd, &inits)){
input_free_esctrie(&nilayer->inputescapes);
free(inits.version);
pthread_cond_destroy(&nilayer->creport_cond);
pthread_mutex_destroy(&nilayer->lock);
return -1;
}
tcache->bg_collides_default = inits.bg;
tcache->termversion = inits.version;
*detected = inits.qterm;
*appsync = inits.appsync;
if(cursor_x){
*cursor_x = inits.cursor_x - 1;
}
if(cursor_y){
*cursor_y = inits.cursor_y - 1;
}
if(inits.pixelwidth && inits.pixelheight){
tcache->pixy = inits.pixelheight;
tcache->pixx = inits.pixelwidth;
}
if(inits.kittygraphics){ // kitty trumps sixel
loginfo("advertised kitty; disabling sixel\n");
tcache->color_registers = 0;
tcache->sixel_maxx = 0;
tcache->sixel_maxy = 0;
*kittygraphs = true;
}
}
}
return 0;

5
src/lib/termdesc.c
View File

@ -674,10 +674,9 @@ int interrogate_terminfo(tinfo* ti, const char* termtype, FILE* out, unsigned ut
#ifdef __APPLE__
ti->qterm = macos_early_matches();
#elif defined(__MINGW64__)
if(prepare_windows_terminal(ti, &tablelen, &tableused)){
return -1;
if(prepare_windows_terminal(ti, &tablelen, &tableused) == 0){
ti->qterm = TERMINAL_MSTERMINAL;
}
ti->qterm = TERMINAL_MSTERMINAL;
(void)termtype;
#elif defined(__linux__)
ti->linux_fb_fd = -1;

17
src/lib/windows.c
View File

@ -1,9 +1,24 @@
#include "termdesc.h"
#include "internal.h"
#ifdef __MINGW64__
#include "windows.h"
// ti has been memset to all zeroes. windows configuration is static.
int prepare_windows_terminal(tinfo* ti, size_t* tablelen, size_t* tableused){
HANDLE in = GetStdHandle(STD_INPUT_HANDLE);
if(in == INVALID_HANDLE_VALUE){
logerror("couldn't get input handle\n");
return -1;
}
// if we're a true Windows Terminal, SetConsoleMode() ought succeed.
// otherwise, we're something else; go ahead and query.
if(!SetConsoleMode(in, ENABLE_MOUSE_INPUT
| ENABLE_VIRTUAL_TERMINAL_INPUT
| ENABLE_PROCESSED_INPUT
| ENABLE_WINDOW_INPUT)){
logerror("couldn't set input console mode\n");
return -1;
}
const struct wtermdesc {
escape_e esc;
const char* tinfo;
@ -44,5 +59,7 @@ int prepare_windows_terminal(tinfo* ti, size_t* tablelen, size_t* tableused){
ti->caps.quadrants = true;
ti->caps.braille = true;
ti->termname = "Windows Terminal";
loginfo("prepared Windows Terminal\n");
return 0;
}
#endif