Changeset fa86732

Timestamp:

Jan 16, 2007, 5:43:26 PM (18 years ago)

Author:

Nelson Elhage <nelhage@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:

32fa306

Parents:

855dc8d

git-author:

Nelson Elhage <nelhage@mit.edu> (01/16/07 17:43:23)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/16/07 17:43:26)

Message:

Adding filter-based word wrapping. Still need a heuristic for when not
to wordwrap.

Files:

• owl.c (modified) (1 diff)
• stylefunc.c (modified) (1 diff)

owl.c

@@ -250 +250 @@
 
   f=owl_malloc(sizeof(owl_filter));
+  owl_filter_init_fromstring(f, "wordwrap", "not ( type ^admin$ or type ^zephyr$ ) ");
+  owl_list_append_element(owl_global_get_filterlist(&g), f);
+
+  f=owl_malloc(sizeof(owl_filter));
   owl_filter_init_fromstring(f, "trash", "class ^mail$ or opcode ^ping$ or type ^admin$ or ( not login ^none$ )");
   owl_list_append_element(owl_global_get_filterlist(&g), f);

stylefunc.c

@@ -9 +9 @@
 void owl_style_basic_format_body(owl_fmtext *fm, owl_message *m) {
   char *indent, *body;
+  owl_filter *f;
+  int wrap = 0;
 
   /* get the body */
   body=owl_strdup(owl_message_get_body(m));
-  body=realloc(body, strlen(body)+30);
-
-  /* add a newline if we need to */
-  if (body[0]!='\0' && body[strlen(body)-1]!='\n') {
-    strcat(body, "\n");
+
+  f = owl_global_get_filter(&g, "wordwrap");
+  if(f && owl_filter_message_match(f, m)) 
+    wrap = 1;
+
+  if(wrap) {
+    int cols, i, width, word;
+    char *tab, *tok, *ws = " \t\n\r";
+    cols = owl_global_get_cols(&g) - OWL_MSGTAB - 1;
+
+    tab = owl_malloc(OWL_MSGTAB+1);
+    for(i = 0; i < OWL_MSGTAB; i++) {
+      tab[i] = ' ';
+    }
+    tab[OWL_MSGTAB] = 0;
+
+    tok = strtok(body, ws);
+    tab[OWL_MSGTAB-1] = 0;
+    owl_fmtext_append_normal(fm, tab);
+    tab[OWL_MSGTAB-1] = ' ';
+    width = 0;
+
+    while(tok) {
+      word = strlen(tok);
+      if(word + width + 1 < cols) {
+        owl_fmtext_append_normal(fm, " ");
+        owl_fmtext_append_normal(fm, tok);
+        width += word + 1;
+      } else {
+        owl_fmtext_append_normal(fm, "\n");
+        owl_fmtext_append_normal(fm, tab);
+        owl_fmtext_append_normal(fm, tok);
+        width = word;
+      }
+      tok = strtok(NULL, ws);
+    }
+    owl_fmtext_append_normal(fm, "\n");
+
+    owl_free(tab);
+  } else {
+    /* do the indenting into indent */
+    indent=owl_malloc(strlen(body)+owl_text_num_lines(body)*OWL_MSGTAB+10);
+    owl_text_indent(indent, body, OWL_MSGTAB);
+    owl_fmtext_append_ztext(fm, indent);
+    if(body[strlen(body)-1] != '\n')
+      owl_fmtext_append_ztext(fm, "\n");
+    owl_free(indent);
   }
 
-  /* do the indenting into indent */
-  indent=owl_malloc(strlen(body)+owl_text_num_lines(body)*OWL_MSGTAB+10);
-  owl_text_indent(indent, body, OWL_MSGTAB);
-  owl_fmtext_append_ztext(fm, indent);
-
-  owl_free(indent);
   owl_free(body);
 }