sascha/wsltty
1
0
Fork 0
mirror of https://github.com/mintty/wsltty.git synced 2025-01-31 02:01:01 +00:00
Code Issues Releases Wiki Activity

rebase patch; add setlocale patch (#273)

Browse Source
This commit is contained in:
mintty 2021-03-16 00:00:00 +01:00
parent 8d896ceb36
commit 74dad091ce
1 changed files with 14 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
0001-notify-size-change-inband.patch
View File

@ -1,137 +1,6 @@
Date: Tue, 15 Sep 2020 06:15:34 +0200
Subject: [PATCH] notify window size change via escaped inband information
(Biswa96/wslbridge2#21, mintty/wsltty#220)
Co-authored-by: Thomas Wolff <towo@towo.net>
---
src/wslbridge2-backend.cpp | 87 +++++++++++++++++++++++++++++++++++++-
src/wslbridge2.cpp | 83 ++++++++++++++++++++++++++++++------
2 files changed, 155 insertions(+), 15 deletions(-)
diff --git a/src/wslbridge2-backend.cpp b/src/wslbridge2-backend.cpp
index b50ee9c..ad429ae 100644
--- a/src/wslbridge2-backend.cpp
+++ b/src/wslbridge2-backend.cpp
@@ -24,6 +24,7 @@
#include <termios.h>
#include <unistd.h>
#include <wordexp.h>
+#include <limits.h> // PIPE_BUF
#include <string>
#include <vector>
@@ -315,6 +316,9 @@ int main(int argc, char *argv[])
/* Use dupped master fd to read OR write */
const int mfd_dp = dup(mfd);
assert(mfd_dp > 0);
+#ifdef debug_to_input
+ FILE * debug = fdopen(mfd_dp, "w"); // for fprintf
+#endif
sigset_t set;
sigemptyset(&set);
@@ -333,6 +337,7 @@ int main(int argc, char *argv[])
ssize_t readRet = 0, writeRet = 0;
char data[1024]; /* Buffer to hold raw data from pty */
+ assert(sizeof data <= PIPE_BUF);
do
{
@@ -343,8 +348,86 @@ int main(int argc, char *argv[])
if (fds[0].revents & POLLIN)
{
readRet = recv(ioSockets.inputSock, data, sizeof data, 0);
- if (readRet > 0)
- writeRet = write(mfd_dp, data, readRet);
+
+ char * s = data;
+ int len = readRet;
+ writeRet = 1;
+ while (writeRet > 0 && len > 0)
+ {
+ if (!*s)
+ {
+ // dispatch NUL escaped inband information
+ s++;
+ len--;
+
+ if (len < 9 && s + 9 >= data + sizeof data)
+ {
+ // make room for additional loading
+ memcpy(data, s, len);
+ s = data;
+ }
+
+ // ensure 1 more byte is loaded to dispatch on
+ if (!len)
+ {
+ readRet = recv(ioSockets.inputSock, s, 1, 0);
+ if (readRet > 0)
+ {
+ len += readRet;
+ }
+ else
+ {
+ writeRet = -1;
+ break;
+ }
+ }
+ if (*s == 2)
+ {
+ // STX: escaped NUL
+ s++;
+ len--;
+ writeRet = write(mfd_dp, "", 1);
+ }
+ else if (*s == 16)
+ {
+ // DLE: terminal window size change
+ s++;
+ len--;
+ // ensure 8 more bytes are loaded for winsize
+ while (readRet > 0 && len < 8)
+ {
+ readRet = recv(ioSockets.inputSock, s + len, 8 - len, 0);
+ if (readRet > 0)
+ {
+ len += readRet;
+ }
+ }
+ if (readRet <= 0)
+ {
+ writeRet = -1;
+ break;
+ }
+ struct winsize * winsp = (struct winsize *)s;
+ s += 8;
+ len -= 8;
+ winsp->ws_xpixel = 0;
+ winsp->ws_ypixel = 0;
+ ret = ioctl(mfd, TIOCSWINSZ, winsp);
+ if (ret != 0)
+ perror("ioctl(TIOCSWINSZ)");
+ }
+ }
+ else
+ {
+ int n = strnlen(s, len);
+ writeRet = write(mfd_dp, s, n);
+ if (writeRet > 0)
+ {
+ s += writeRet;
+ len -= writeRet;
+ }
+ }
+ }
}
/* Resize window when buffer received in control socket */
diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
index 75ccb1b..e9fbbf7 100644
--- a/src/wslbridge2.cpp
+++ b/src/wslbridge2.cpp
@@ -56,32 +56,85 @@ union IoSockets
--- a/src/wslbridge2.cpp 2020-10-18 15:03:06.000000000 +0000
+++ b/src/wslbridge2.cpp 2021-02-26 17:45:28.437040700 +0000
@@ -57,32 +57,85 @@ union IoSockets
/* global variable */
static union IoSockets g_ioSockets = { 0, 0, 0 };
@ -223,8 +92,16 @@ index 75ccb1b..e9fbbf7 100644
break;
}
}
@@ -537,13 +590,6 @@ int main(int argc, char *argv[])
closesocket(controlSocket);
@@ -164,6 +217,7 @@ int main(int argc, char *argv[])
if (GetWindowsBuild() < 17763)
fatal("Windows 10 version is older than minimal requirement.\n");
+ setlocale(LC_ALL, "");
#ifdef __CYGWIN__
cygwin_internal(CW_SYNC_WINENV);
#endif
@@ -529,13 +583,6 @@ int main(int argc, char *argv[])
g_ioSockets.controlSock = AcceptLocSock(controlSocket);
}
- /* Create thread to send window size through control socket */
@ -237,7 +114,7 @@ index 75ccb1b..e9fbbf7 100644
/* Create thread to send input buffer to input socket */
pthread_t tidInput;
ret = pthread_create(&tidInput, nullptr, send_buffer, nullptr);
@@ -556,6 +602,17 @@ int main(int argc, char *argv[])
@@ -548,6 +595,17 @@ int main(int argc, char *argv[])
termState.enterRawMode();