From b0b4c965a5247b6843c95be82ba773f6df96db07 Mon Sep 17 00:00:00 2001 From: nick black Date: Thu, 14 Oct 2021 00:12:43 -0400 Subject: [PATCH] for now, if it's on windows, it's windows terminal #2248 --- src/lib/in.c | 3 ++- src/lib/windows.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/in.c b/src/lib/in.c index cd924f006..60f3af956 100644 --- a/src/lib/in.c +++ b/src/lib/in.c @@ -1377,7 +1377,7 @@ getpipes(ipipe pipes[static 2]){ #endif #else // windows if(!CreatePipe(&pipes[0], &pipes[1], NULL, BUFSIZ)){ - logerror("couldn't get pipes (%u)\n", GetLastError()); + logerror("couldn't get pipes\n"); return -1; } #endif @@ -1406,6 +1406,7 @@ create_inputctx(tinfo* ti, FILE* infp, int lmargin, int tmargin, int rmargin, if(set_fd_nonblocking(i->stdinfd, 1, &ti->stdio_blocking_save) == 0){ i->termfd = tty_check(i->stdinfd) ? -1 : get_tty_fd(infp); memset(i->initdata, 0, sizeof(*i->initdata)); + i->initdata->qterm = ti->qterm; i->iread = i->iwrite = i->ivalid = 0; i->cread = i->cwrite = i->cvalid = 0; i->initdata_complete = NULL; diff --git a/src/lib/windows.c b/src/lib/windows.c index ba1c4bda7..09e070413 100644 --- a/src/lib/windows.c +++ b/src/lib/windows.c @@ -88,6 +88,7 @@ int prepare_windows_terminal(tinfo* ti, size_t* tablelen, size_t* tableused){ return -1; } loginfo("verified Windows ConPTY\n"); + ti->qterm = TERMINAL_MSTERMINAL; return 0; } #endif