Add full Unicode support to non-ansi consoles. Correct detection of W…

…indows Terminal.
Bill-Gray · May 9, 2023 · 75b62ea · 75b62ea
1 parent 3ec63c9
commit 75b62ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/wincon/pdcdisp.c b/wincon/pdcdisp.c
@@ -152,7 +152,7 @@ static void _show_run_of_ansi_characters( const attr_t attr,
                            const int lineno, const int x, const chtype *srcp, const int len)
 {
 #ifdef PDC_WIDE
-    WCHAR buffer[MAX_PACKET_SIZE];
+    WCHAR buffer[MAX_PACKET_SIZE*2];
 #else
     char buffer[MAX_PACKET_SIZE];
 #endif
@@ -169,9 +169,9 @@ static void _show_run_of_ansi_characters( const attr_t attr,
             ch = ' ';
 
 #ifdef PDC_WIDE
-        chtype uc = ch & A_CHARTEXT;  //o//
-        if( uc != DUMMY_CHAR_NEXT_TO_FULLWIDTH){
-            if (uc & 0xFF0000){
+        chtype uc = ch & A_CHARTEXT;
+        if( uc < 0x110000){
+            if (uc & 0x1F0000){
                 buffer[n_out++] = (WCHAR)((uc - 0x10000) >> 10 | 0xD800); /* first UTF-16 unit */
                 buffer[n_out++] = (WCHAR)(uc & 0x3FF) | 0xDC00;         /* second UTF-16 unit */
             }else   
@@ -228,10 +228,18 @@ static void _show_run_of_nonansi_characters( attr_t attr,
 
         buffer[n_out].Attributes = mapped_attr;
 #ifdef PDC_WIDE
-            if( (ch & A_CHARTEXT) != DUMMY_CHAR_NEXT_TO_FULLWIDTH)
+        chtype uc = ch & A_CHARTEXT;
+        if( uc < 0x110000){
+            if (uc & 0x1F0000){
+                buffer[n_out++].Char.UnicodeChar = (WCHAR)((uc - 0x10000) >> 10 | 0xD800); /* first UTF-16 unit */
+                buffer[n_out].Attributes = mapped_attr;
+                buffer[n_out++].Char.UnicodeChar = (WCHAR)(uc & 0x3FF) | 0xDC00;   /* second UTF-16 unit */
+            }else   
+                buffer[n_out++].Char.UnicodeChar = (WCHAR)uc;
+        }
+#else
+        buffer[n_out++].Char.UnicodeChar = (WCHAR)( ch & A_CHARTEXT);
 #endif
-           buffer[n_out++].Char.UnicodeChar = (WCHAR)( ch & A_CHARTEXT);
-    }
 
     bufPos.X = bufPos.Y = 0;
     bufSize.X = (SHORT)n_out;

diff --git a/wincon/pdcscrn.c b/wincon/pdcscrn.c
@@ -413,11 +413,7 @@ int PDC_scr_open(void)
     pdc_wt = !!getenv("WT_SESSION");
     str = pdc_wt ? NULL : getenv("ConEmuANSI");
     pdc_conemu = !!str;
-    pdc_ansi =
-#ifdef PDC_WIDE
-        pdc_wt ? TRUE :
-#endif
-        pdc_conemu ? !strcmp(str, "ON") : FALSE;
+    pdc_ansi = !pdc_wt && pdc_conemu && !strcmp(str, "ON");
 
     GetConsoleScreenBufferInfo(pdc_con_out, &csbi);
     GetConsoleScreenBufferInfo(pdc_con_out, &orig_scr);