Ticket #3012: UTF8Char.h.diff

src/apps/terminal/UTF8Char.h

@@ -28 +28 @@
 
        void SetTo(const char* c, int32 count)
        {
-               bytes[0] = c[0];
-               if (count > 1) {
-                       bytes[1] = c[1];
-                       if (count > 2) {
-                               bytes[2] = c[2];
-                               if (count > 3)
-                                       bytes[3] = c[3];
-                       }
+               for (int i = 0; i < count; i++) {
+                       bytes[i] = c[i];
                }
        }
 
        static int32 ByteCount(char firstChar)
        {
-               // Note, this does not recognize invalid chars
-               uint32 c = firstChar;
-               if (c < 0x80)
-                       return 1;
-               if (c < 0xe0)
-                       return 2;
-               return c < 0xf0 ? 3 : 4;
+               const unsigned char BIT3 = 8;
+               const unsigned char BIT4 = 16;
+               const unsigned char BIT5 = 32;
+               const unsigned char BIT6 = 64;
+               const unsigned char BIT7 = 128;
+
+               uchar c = (uchar)firstChar;
+               uchar invc = ~c;
+
+               if ((invc & BIT7) == BIT7)
+                       return 1; else
+               if (((c & (BIT7 | BIT6)) == (BIT7 | BIT6)) 
+                       && ((invc & BIT5) == BIT5))
+                       return 2; else
+               if (((c & (BIT7 | BIT6 | BIT5)) == (BIT7 | BIT6 | BIT5))
+                       && ((invc & BIT4) == BIT4))
+                       return 3; else
+               if (((c & (BIT7 | BIT6 | BIT5 | BIT4)) == (BIT7 | BIT6 | BIT5 | BIT4))
+                       && ((invc & BIT3) == BIT3))
+                       return 4; else
+                       return 0; /* Error, no UTF8 Byte */
        }
 
        int32 ByteCount() const