Changeset dd24b6a

Timestamp:

Dec 24, 2007, 10:14:09 AM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9866c3a

Parents:

762512d

Message:

* include wchar.h
* replace hand-rolled width detection with wcswidth.
* pad with space if we end up halfway into a character at the start of a line.

WARNING: Still not safe.

Files:

• fmtext.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• text.c (modified) (2 diffs)

fmtext.c

@@ -316 +316 @@
 {
   char *ptr_s, *ptr_e, *ptr_c, *last;
-  int col, cnt;
+  int col, cnt, padding;
 
   last=in->textbuff+in->textlen-1;
@@ -335 +335 @@
     col = 0;
     cnt = 0;
+    padding = 0;
     ptr_c = ptr_s;
     while(col < bcol && ptr_c < ptr_e) {
       gunichar c = g_utf8_get_char(ptr_c);
-      if (g_unichar_iswide(c)) {
-        if (col + 2 > bcol) break;
-        else col += 2;
-      }
-      else if (g_unichar_type(c) == G_UNICODE_NON_SPACING_MARK) ; /*do nothing*/
-      /* We may need more special cases here... unicode spacing is hard. */
-      else {
-        if (col + 1 > bcol) break;
-        else ++col;
-      }
+      if (col + wcwidth(c) > bcol) break;
+      col += wcwidth(c);
       ptr_c = g_utf8_next_char(ptr_c);
-      if (col >= acol) ++cnt;
-      if (col <= acol) ptr_s = ptr_c;
-    }
-    _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
+      if (col >= acol) {
+        if (cnt == 0) {
+          ptr_s = ptr_c;
+          padding = col - acol;
+        }
+        ++cnt;
+      }
+    }
+    if (cnt) {
+      while(padding-- > 0) {
+        owl_fmtext_append_normal(out, " ");
+      }
+      _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
+    }
+    else {
+      owl_fmtext_append_normal(out, "\n");
+    }
     ptr_s=ptr_e+1;
-    
+      
 #if 0
     /* we need to check that we won't run over here */

owl.h

@@ -52 +52 @@
 #include <termios.h>
 #include <libfaim/aim.h>
+#include <wchar.h>
 #include "config.h"
 #include "glib.h"

text.c

@@ -51 +51 @@
 {
   char *ptr_s, *ptr_e, *ptr_c, *tmpbuff, *last;
-  int col, cnt;
+  int col, cnt, padding;
   
   tmpbuff=owl_malloc(strlen(in)+20);
@@ -73 +73 @@
     col = 0;
     cnt = 0;
+    padding = 0;
     ptr_c = ptr_s;
     while(col < bcol && ptr_c < ptr_e) {
       gunichar c = g_utf8_get_char(ptr_c);
-      if (g_unichar_iswide(c)) {
-        if (col + 2 > bcol) break;
-        else col += 2;
+      if (col + wcwidth(c) > bcol) break;
+      col += wcwidth(c);
+      ptr_c = g_utf8_next_char(ptr_c);
+      if (col >= acol) {
+        if (cnt == 0) {
+          ptr_s = ptr_c;
+          padding = col - acol;
+        }
+        ++cnt;
       }
-      else if (g_unichar_type(c) == G_UNICODE_NON_SPACING_MARK) ; /*do nothing*/
-      /* We may need more special cases here... unicode spacing is hard. */
-      else {
-        if (col + 1 > bcol) break;
-        else ++col;
+    }
+    if (cnt) {
+      while(padding-- > 0) {
+        strcat(tmpbuff, " ");
       }
-      ptr_c = g_utf8_next_char(ptr_c);
-      if (col >= acol) ++cnt;
-      if (col <= acol) ptr_s = ptr_c;
-    }
-    strncat(tmpbuff, ptr_s, ptr_c - ptr_s - 1);
+      strncat(tmpbuff, ptr_s, ptr_c - ptr_s - 1);
+    }
     strcat(tmpbuff, "\n");
     ptr_s = ptr_e + 1;