bugfix

chivstyle · Nov 21, 2022 · c2ad6b2 · c2ad6b2
1 parent 7ddbe0d
commit c2ad6b2
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 21 deletions.
diff --git a/comxd/comxd.t b/comxd/comxd.t
@@ -147,7 +147,8 @@ zhCN("\351\207\215\346\226\260\350\277\236\346\216\245\345\210\260I/O\350\256\27
 T_("Welcom to comxd!")
 zhCN("\346\254\242\350\277\216\344\275\277\347\224\250comxd!")
 
-// Terminal.cpp
+
+// PACKAGE 'Terminal' FILE 'Terminal.cpp'
 
 T_("Options")
 zhCN("")
@@ -237,7 +238,7 @@ T_("Lazy resize")
 zhCN("")
 
 
-// Colors.cpp
+// PACKAGE 'Terminal' FILE 'Colors.cpp'
 
 T_("Bad hash color text format")
 zhCN("")

diff --git a/comxd/comxd.tpp/about_en-us.tpp b/comxd/comxd.tpp/about_en-us.tpp
@@ -3,7 +3,7 @@ topic "";
 [{_} 
 [s0;/ &]
 [s0; [*^https`:`/`/github`.com`/chivstyle`/comxd^@3 comxd][*  ][/ Version 
-2.3.1.This program uses ][/^https`:`/`/www`.ultimatepp`.org`/^ U`+`+][/ , 
+2.3.2.This program uses ][/^https`:`/`/www`.ultimatepp`.org`/^ U`+`+][/ , 
 ][/^http`:`/`/wjwwood`.io`/serial`/^ serial][/ , ][/^https`:`/`/github`.com`/ismail`-yilmaz`/Terminal^ T
 erminalCtrl][/  .]&]
 [s0;/ &]

diff --git a/comxd/comxd.tpp/about_en-us.tppi b/comxd/comxd.tpp/about_en-us.tppi
@@ -1,4 +1,4 @@
 TITLE("")
 COMPRESSED
-120,156,133,144,209,74,3,49,16,69,127,101,192,226,67,183,38,219,46,8,86,144,130,126,66,245,37,100,157,152,198,221,209,100,179,36,89,99,21,255,221,110,107,69,65,112,94,230,60,220,123,153,185,2,38,147,114,86,158,148,255,204,242,198,60,170,193,38,41,222,239,63,64,196,242,146,195,169,28,55,136,105,221,166,212,71,92,34,71,222,80,106,135,7,100,218,59,228,186,165,151,152,182,214,236,208,187,215,77,189,170,96,15,82,76,1,164,224,112,103,66,36,223,193,130,85,108,206,214,45,69,232,131,111,130,114,48,68,19,71,205,207,244,156,51,178,221,25,228,84,50,125,143,204,135,6,121,13,183,88,96,49,230,205,190,29,95,134,167,156,189,223,32,35,143,60,154,64,202,142,250,3,253,54,252,245,0,69,167,200,226,217,150,172,83,111,200,215,38,56,234,148,173,225,72,215,41,236,115,128,201,67,31,199,94,174,64,240,226,98,1,157,247,157,209,170,211,65,233,103,74,184,154,159,87,99,184,148,242,19,235,71,124,64,
+120,156,133,144,221,74,195,64,16,133,95,101,192,226,69,211,238,198,4,4,43,72,65,31,161,122,179,108,156,109,186,77,70,247,39,236,110,140,85,124,119,155,214,138,130,224,220,204,119,113,206,97,230,8,152,76,242,89,126,150,255,51,139,59,189,85,189,73,82,188,63,126,128,136,249,53,135,115,57,110,16,211,170,77,169,139,184,64,142,188,161,212,246,107,100,181,183,200,235,150,94,98,218,25,189,71,111,95,55,213,178,132,3,72,49,5,144,130,195,131,14,145,188,131,130,149,172,96,171,150,34,116,193,55,65,89,232,163,142,163,230,103,250,48,12,200,246,103,144,85,73,119,29,50,31,26,228,21,220,99,134,217,152,55,251,118,124,25,158,134,193,251,13,50,242,200,163,14,164,204,168,63,210,111,195,95,15,80,180,138,12,206,119,100,172,122,67,190,210,193,146,83,166,130,19,221,166,112,200,1,38,143,125,156,122,185,1,193,179,171,2,156,247,78,215,202,213,65,213,207,148,112,121,113,89,142,225,82,202,79,236,56,124,65,
 
diff --git a/comxd/comxd.tpp/about_zh-cn.tpp b/comxd/comxd.tpp/about_zh-cn.tpp
@@ -3,7 +3,7 @@ topic "";
 [{_} 
 [s0;/ &]
 [s0; [*^https`:`/`/github`.com`/chivstyle`/comxd^@3 comxd][*  ][/ Version 
-2.3.1.本程序使用到了 ][/^https`:`/`/www`.ultimatepp`.org`/^ U`+`+][/ , 
+2.3.2.本程序使用到了 ][/^https`:`/`/www`.ultimatepp`.org`/^ U`+`+][/ , 
 ][/^http`:`/`/wjwwood`.io`/serial`/^ serial][/ , ][/^https`:`/`/github`.com`/ismail`-yilmaz`/Terminal^ T
 erminalCtrl][/  .]&]
 [s0;/ &]

diff --git a/comxd/comxd.tpp/about_zh-cn.tppi b/comxd/comxd.tpp/about_zh-cn.tppi
@@ -1,5 +1,5 @@
 TITLE("")
 COMPRESSED
-120,156,133,144,205,74,3,49,20,133,95,229,130,197,69,167,38,211,14,8,86,144,130,62,130,186,9,25,111,156,198,78,52,153,12,73,234,88,197,173,8,46,220,184,244,1,186,112,225,186,32,190,76,107,95,195,78,107,69,65,240,110,238,183,56,231,220,31,6,141,70,220,138,55,226,127,170,123,32,207,196,80,7,206,110,78,110,129,249,120,151,194,38,175,59,176,102,154,135,80,122,236,34,69,58,80,33,31,158,34,201,172,65,154,229,234,210,135,145,150,11,180,230,170,159,246,18,88,2,103,77,0,206,40,28,75,231,149,45,160,67,18,210,38,31,207,47,243,241,195,108,242,56,125,123,159,63,141,103,247,175,211,201,93,173,251,57,161,170,42,36,139,85,148,17,65,150,37,18,235,6,72,83,56,194,8,163,58,179,245,237,248,50,156,87,149,181,125,36,202,34,245,210,41,161,107,253,138,126,27,254,58,66,121,35,148,198,173,145,210,70,92,35,61,148,206,168,66,232,20,214,180,31,220,50,7,8,95,253,100,253,155,61,96,52,218,233,64,97,109,33,51,81,100,78,100,
-23,42,96,175,189,157,212,225,156,243,79,133,61,132,234,
+120,156,133,144,205,74,3,49,20,133,95,229,130,197,69,167,38,227,12,8,86,144,130,62,130,186,9,25,111,156,198,54,154,76,134,36,117,172,226,86,4,23,110,92,250,0,93,116,225,186,32,190,76,107,95,195,78,107,69,65,240,110,238,183,56,231,220,31,6,141,70,220,138,55,226,127,170,125,40,207,197,64,7,206,110,79,239,128,249,120,143,194,38,175,59,176,102,214,15,161,244,216,70,138,180,167,66,127,112,134,36,183,6,105,222,87,87,62,12,181,92,160,53,215,221,172,147,194,18,56,107,2,112,70,225,68,58,175,108,1,9,73,73,66,62,94,198,243,209,227,108,242,52,125,123,159,63,143,102,15,175,211,201,125,173,251,57,161,170,42,36,139,85,148,17,65,150,37,18,235,122,72,51,56,198,8,163,58,179,245,237,248,50,92,84,149,181,93,36,202,34,245,210,41,161,107,253,138,126,27,254,58,66,121,35,148,198,173,161,210,70,220,32,61,146,206,168,66,232,12,214,116,16,220,50,7,8,95,253,100,253,155,125,96,52,218,77,160,176,182,144,185,40,114,39,242,
+75,21,176,179,189,147,214,225,156,243,79,134,50,132,235,
 
diff --git a/comxd/ioimpls/PipeClient.cpp b/comxd/ioimpls/PipeClient.cpp
@@ -137,18 +137,23 @@ size_t NamedPipeClient::Write(const unsigned char* buf, size_t sz)
 bool NamedPipeClient::Start()
 {
     Vector<char16> dname = ToUtf16(mName); dname.push_back(0);
-    mPipe = CreateFileW(
-         (const WCHAR*)dname.begin(),   // pipe name
-         GENERIC_READ |  // read and write access
-         GENERIC_WRITE,
-         0,              // no sharing
-         NULL,           // default security attributes
-         OPEN_EXISTING,  // opens existing pipe
-         FILE_FLAG_OVERLAPPED,   // default attributes
-         NULL);          // no template file
-    if (mPipe == INVALID_HANDLE_VALUE) {
-        return false;
+    // try
+    for (int k = 0; k < 3; ++k) {
+	    mPipe = CreateFileW(
+	         (const WCHAR*)dname.begin(),   // pipe name
+	         GENERIC_READ |  // read and write access
+	         GENERIC_WRITE,
+	         0,              // no sharing
+	         NULL,           // default security attributes
+	         OPEN_EXISTING,  // opens existing pipe
+	         FILE_FLAG_OVERLAPPED,   // default attributes
+	         NULL);          // no template file
+	    if (mPipe != INVALID_HANDLE_VALUE) {
+	        break;
+	    }
+	    Sleep(100);
     }
+    if (mPipe == INVALID_HANDLE_VALUE) return false;
     // we need to wait for the clients
     mEventIn = CreateEvent(NULL, TRUE, TRUE, NULL);
     mEventOut = CreateEvent(NULL, TRUE, TRUE, NULL);

diff --git a/comxd/main.cpp b/comxd/main.cpp
@@ -211,8 +211,6 @@ class MainWindow : public WithMainWindow<TopWindow> {
 
 GUI_APP_MAIN
 {
-    Upp::SetLanguage(GetSystemLNG());
-    //
     MainWindow win;
     win.SetRect(0, 0, 800, 600);
     win.Run();

diff --git a/xterminal/connimpls/SerialConnVT.cpp b/xterminal/connimpls/SerialConnVT.cpp
@@ -1338,7 +1338,8 @@ bool SerialConnVT::Key(dword key, int)
             processed = ProcessKeyDown(d_key, flags);
         }
     } else {
-        if (key < 0xffff) {
+        // code point
+        if (key <= 0x10ffff) {
             processed = ProcessKeyDown(key, flags);
             if (!processed) {
                 // key is UCS-2, not UTF-16, so we can't support full UNICODE. If the upp