Changeset f7cd7c9 for text.c

Timestamp:

Jan 9, 2010, 4:02:47 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

366558f

Parents:

8a16704

git-author:

Anders Kaseorg <andersk@mit.edu> (01/09/10 03:19:26)

git-committer:

Anders Kaseorg <andersk@mit.edu> (01/09/10 16:02:47)

Message:

owl_text_expand_tabs, meet multibyte and wide characters.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• text.c (modified) (2 diffs)

text.c

@@ -131 +131 @@
 char *owl_text_expand_tabs(const char *in)
 {
-  int ntabs = 0;
+  int len = 0;
   const char *p = in;
   char *ret, *out;
   int col;
 
+  col = 0;
   while(*p) {
-    if (*(p++) == '\t') ntabs++;
-  }
-
-  ret = owl_malloc(strlen(in) + 1 + OWL_TAB_WIDTH * ntabs);
+    gunichar c = g_utf8_get_char(p);
+    char *q = g_utf8_next_char(p);
+    switch (c) {
+    case '\t':
+      do { len++; col++; } while (col % OWL_TAB_WIDTH);
+      p = q;
+      continue;
+    case '\n':
+      col = 0;
+      break;
+    default:
+      col += mk_wcwidth(c);
+      break;
+    }
+    len += q - p;
+    p = q;
+  }
+
+  ret = owl_malloc(len + 1);
 
   p = in;
@@ -147 +163 @@
   col = 0;
   while(*p) {
-    switch(*p) {
+    gunichar c = g_utf8_get_char(p);
+    char *q = g_utf8_next_char(p);
+    switch (c) {
     case '\t':
       do {*(out++) = ' '; col++; } while (col % OWL_TAB_WIDTH);
-      break;
+      p = q;
+      continue;
     case '\n':
-      col = -1;
+      col = 0;
+      break;
     default:
-      col++;
-      *(out++) = *p;
-    }
-    p++;
+      col += mk_wcwidth(c);
+      break;
+    }
+    memcpy(out, p, q - p);
+    out += q - p;
+    p = q;
   }