Changeset c93b8b5

Timestamp:

Jul 31, 2010, 7:11:42 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:

2b83ad6

Parents:

e0e0e5a

git-author:

David Benjamin <davidben@mit.edu> (07/25/10 17:51:14)

git-committer:

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

Message:

Consider format characters in owl_fmtext_num_lines

This fixes the second failure in the owl_fmtext test.

File:

• fmtext.c (modified) (1 diff)

fmtext.c

@@ -503 +503 @@
 {
   int lines, i;
-
-  if (f->textlen==0) return(0);
-  
+  char *lastbreak, *p;
+
   lines=0;
+  lastbreak = f->textbuff;
   for (i=0; i<f->textlen; i++) {
-    if (f->textbuff[i]=='\n') lines++;
-  }
-
-  /* if the last char wasn't a \n there's one more line */
-  if (f->textbuff[i-1]!='\n') lines++;
+    if (f->textbuff[i]=='\n') {
+      lastbreak = f->textbuff + i;
+      lines++;
+    }
+  }
+
+  /* Check if there's a trailing line; formatting characters don't count. */
+  for (p = g_utf8_next_char(lastbreak);
+       p < f->textbuff + f->textlen;
+       p = g_utf8_next_char(p)) {
+    if (!owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+      lines++;
+      break;
+    }
+  }
 
   return(lines);