Changeset f6b319c

Timestamp:

Apr 29, 2007, 6:27:30 PM (17 years ago)

Author:

Sam Hartman <hartmans@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:

d791cdb

Parents:

03cf6b9

Message:

Implement hackish support for the wordwrap filter in the perl styles.
Note that while I think the user-visible parts of this are reasonably
OK the implementation needs cleanup.


* perlconfig.c: Add should_wordwrap attribute to message hashes.  This
   is a hack; a better solution is to expose an arbitrary interface for
   doing filter matches from perl.  That proved to be more than I had
   time for.
* perlglue.xs: expose owl_text_wordwrap
* perlwrap.pm: use in the default style

Files:

• perlconfig.c (modified) (2 diffs)
• perlglue.xs (modified) (1 diff)
• perlwrap.pm (modified) (2 diffs)

perlconfig.c

@@ -33 +33 @@
   int i, j;
   owl_pair *pair;
+  owl_filter *wrap;
 
   if (!m) return &PL_sv_undef;
+  wrap = owl_global_get_filter(&g, "wordwrap");
+  if(!wrap) {
+      owl_function_error("wrap filter is not defined");
+      return &PL_sv_undef;
+  }
+
   h = newHV();
 
@@ -85 +92 @@
   hv_store(h, "deleted", strlen("deleted"), newSViv(owl_message_is_delete(m)),0);
   hv_store(h, "private", strlen("private"), newSViv(owl_message_is_private(m)),0);
+  hv_store(h, "should_wordwrap",
+           strlen("should_wordwrap"), newSViv(
+                                              owl_filter_message_match(wrap, m)),0);
 
   type = owl_message_get_type(m);

perlglue.xs

@@ -315 +315 @@
                 }
         }
+
+char *
+wordwrap(in, cols)
+        char *in
+        int cols
+        PREINIT:
+                char *rv = NULL;
+        CODE:
+rv = owl_text_wordwrap(in, cols);
+                RETVAL = rv;    
+        OUTPUT:
+                RETVAL
+        CLEANUP:
+                if (rv) owl_free(rv);

perlwrap.pm

@@ -418 +418 @@
             BarnOwl::ModuleLoader->load_all;
         };
-        BarnOwl::error("Error loading modules: $@") if $@;
+        BarnOwl::error("$@") if $@;
+open TMP, ">/tmp/error";
+print TMP $@;
+
     } else {
         BarnOwl::error("Can't load BarnOwl::ModuleLoader, loadable module support disabled:\n$@");
@@ -528 +531 @@
 
     my $body = $m->body;
+    if ($m->{should_wordwrap}) {
+      $body = BarnOwl::wordwrap($body, BarnOwl::getnumcols()-8);
+    }
     # replace newline followed by anything with
     # newline plus four spaces and that thing.