Changeset 2b83ad6

Timestamp:

Jul 31, 2010, 7:12:15 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

30da473

Parents:

c93b8b5

git-author:

David Benjamin <davidben@mit.edu> (07/25/10 18:36:54)

git-committer:

David Benjamin <davidben@mit.edu> (07/31/10 19:12:15)

Message:

Add owl_fmtext_expand_tabs with test case

Files:

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

fmtext.c

@@ -370 +370 @@
 {
   _owl_fmtext_curs_waddstr(f, w, 0);
+}
+
+/* Expands tabs. Tabs are expanded as if given an initial indent of start. */
+void owl_fmtext_expand_tabs(const owl_fmtext *in, owl_fmtext *out, int start) {
+  int col = start, numcopied = 0;
+  char *ptr;
+
+  /* Copy the default attributes. */
+  out->default_attrs = in->default_attrs;
+  out->default_fgcolor = in->default_fgcolor;
+  out->default_bgcolor = in->default_bgcolor;
+
+  for (ptr = in->textbuff;
+       ptr < in->textbuff + in->textlen;
+       ptr = g_utf8_next_char(ptr)) {
+    gunichar c = g_utf8_get_char(ptr);
+    int chwidth;
+    if (c == '\t') {
+      /* Copy up to this tab */
+      _owl_fmtext_append_fmtext(out, in, numcopied, ptr - in->textbuff - 1);
+      /* and then copy spaces for the tab. */
+      chwidth = OWL_TAB_WIDTH - (col % OWL_TAB_WIDTH);
+      owl_fmtext_append_spaces(out, chwidth);
+      col += chwidth;
+      numcopied = g_utf8_next_char(ptr) - in->textbuff;
+    } else {
+      /* Just update col. We'll append later. */
+      if (c == '\n') {
+        col = start;
+      } else if (!owl_fmtext_is_format_char(c)) {
+        col += mk_wcwidth(c);
+      }
+    }
+  }
+  /* Append anything we've missed. */
+  if (numcopied < in->textlen)
+    _owl_fmtext_append_fmtext(out, in, numcopied, in->textlen - 1);
 }
 

owl.h

@@ -113 +113 @@
 #define OWL_COLOR_DEFAULT   -1
 #define OWL_COLOR_INVALID   -2
+
+#define OWL_TAB_WIDTH 8
 
 #define OWL_EDITWIN_STYLE_MULTILINE 0

tester.c

@@ -470 +470 @@
   owl_free(str);
 
+  /* Test owl_fmtext_expand_tabs. */
+  owl_fmtext_clear(&fm1);
+  owl_fmtext_append_normal(&fm1, "12\t1234");
+  owl_fmtext_append_bold(&fm1, "567\t1\n12345678\t1");
+  owl_fmtext_clear(&fm2);
+  owl_fmtext_expand_tabs(&fm1, &fm2, 0);
+  str = owl_fmtext_print_plain(&fm2);
+  FAIL_UNLESS("no tabs remaining", strchr(str, '\t') == NULL);
+  FAIL_UNLESS("tabs corrected expanded",
+              str && !strcmp(str, "12      1234567 1\n"
+                                  "12345678        1"));
+  owl_free(str);
+
+  owl_fmtext_clear(&fm2);
+  owl_fmtext_expand_tabs(&fm1, &fm2, 1);
+  str = owl_fmtext_print_plain(&fm2);
+  FAIL_UNLESS("no tabs remaining", strchr(str, '\t') == NULL);
+  FAIL_UNLESS("tabs corrected expanded",
+              str && !strcmp(str, "12     1234567 1\n"
+                                  "12345678       1"));
+  owl_free(str);
+
   owl_fmtext_cleanup(&fm1);
   owl_fmtext_cleanup(&fm2);

text.c

@@ -125 +125 @@
   return(out2);
 }
-
-#define OWL_TAB_WIDTH 8
 
 /* Caller must free return */