Ticket #6227: terminal-6227.patch

BasicTerminalBuffer.cpp

@@ -558 +558 @@
 //(int)c.ByteCount(), c.bytes, c.bytes[0], attributes);
     if ((int32)width == FULL_WIDTH)
         attributes |= A_WIDTH;
+    else if (c.IsFullWidth())
+    {
+        attributes |= A_WIDTH;
+        width = 2;
+    }
 
     if (fSoftWrappedCursor || fCursor.x + (int32)width > fWidth)
         _SoftBreakLine();

TermParse.cpp

@@ -376 +376 @@
                 parsestate = groundtable;
                 currentEncoding = fBuffer->Encoding();
             }
-
     //debug_printf("TermParse: char: '%c' (%d), parse state: %d\n", c, c, parsestate[c]);
-            switch (parsestate[c]) {
+            int parsestatus = parsestate[c];
+            if(currentEncoding == B_GBK_CONVERSION) 
+            {
+                if ((c > 0xA1 && c < 0xA9)
+                    || (c>0xB0 && c< 0xF7)
+                    || (c>0x81 && c< 0xA0)
+                    || (c>0xAA && c< 0xFE)
+                    || (c>0xA8 && c< 0xA9))
+                    parsestatus = CASE_PRINT_GR;
+            }
+            switch (parsestatus) {
                 case CASE_PRINT:
                     fBuffer->InsertChar((char)c, fAttr);
                     break;
@@ -425 +434 @@
                     }
 
                     srcLen = strlen(cbuf);
+                    dstLen = 4;
                     if (currentEncoding != B_JIS_CONVERSION) {
                         convert_to_utf8(currentEncoding, cbuf, &srcLen,
                             dstbuf, &dstLen, &dummyState, '?');

UTF8Char.h

@@ -57 +57 @@
 
     bool IsFullWidth() const
     {
-        // TODO: Implement!
-        return false;
+        return ((unsigned char)bytes[0] > 0xe0);
     }
 
     bool IsSpace() const