Changes in style.c [864ed35:5a9f6fe]

File:

• style.c (modified) (4 diffs)

style.c

@@ -1 @@
-#define OWL_PERL
 #include "owl.h"
 
 static const char fileIdent[] = "$Id$";
 
-void owl_style_create_perl(owl_style *s, char *name, SV *obj)
+void owl_style_create_internal(owl_style *s, char *name, void (*formatfunc) (owl_fmtext *fm, owl_message *m), char *description)
 {
+  s->type=OWL_STYLE_TYPE_INTERNAL;
   s->name=owl_strdup(name);
-  s->perlobj = SvREFCNT_inc(obj);
+  if (description) {
+    s->description=owl_strdup(description);
+  } else {
+    s->description=owl_sprintf("Owl internal style %s", name);
+  }
+  s->perlfuncname=NULL;
+  s->formatfunc=formatfunc;
+}
+
+void owl_style_create_perl(owl_style *s, char *name, char *perlfuncname, char *description)
+{
+  s->type=OWL_STYLE_TYPE_PERL;
+  s->name=owl_strdup(name);
+  s->perlfuncname=owl_strdup(perlfuncname);
+  if (description) {
+    s->description=owl_strdup(description);
+  } else {
+    s->description=owl_sprintf("User-defined perl style that calls %s", 
+                               perlfuncname);
+  }
+  s->formatfunc=NULL;
 }
 
@@ -23 +43 @@
 char *owl_style_get_description(owl_style *s)
 {
-  SV *sv = NULL;
-  OWL_PERL_CALL_METHOD(s->perlobj,
-                       "description",
-                       /* no args */,
-                       "Error in style_get_description: %s",
-                       0,
-                       sv = SvREFCNT_inc(POPs);
-                       );
-  if(sv) {
-    return SvPV_nolen(sv_2mortal(sv));
-  } else {
-    return "[error getting description]";
-  }
+  return(s->description);
 }
 
@@ -43 +51 @@
 void owl_style_get_formattext(owl_style *s, owl_fmtext *fm, owl_message *m)
 {
-  char *body, *indent;
-  int curlen;
+  if (s->type==OWL_STYLE_TYPE_INTERNAL) {
+    (* s->formatfunc)(fm, m);
+  } else if (s->type==OWL_STYLE_TYPE_PERL) {
+    char *body, *indent;
+    int curlen;
 
-  SV *sv = NULL;
-  
-  /* Call the perl object */
-  OWL_PERL_CALL_METHOD(s->perlobj,
-                       "format_message",
-                       XPUSHs(owl_perlconfig_message2hashref(m));,
-                       "Error in format_message: %s",
-                       0,
-                       sv = SvREFCNT_inc(POPs);
-                       );
+    /* run the perl function */
+    body=owl_perlconfig_getmsg(m, 1, s->perlfuncname);
+    if (!strcmp(body, "")) {
+      owl_free(body);
+      body=owl_strdup("<unformatted message>");
+    }
+    
+    /* indent and ensure ends with a newline */
+    indent=owl_malloc(strlen(body)+(owl_text_num_lines(body))*OWL_TAB+10);
+    owl_text_indent(indent, body, OWL_TAB);
+    curlen = strlen(indent);
+    if (curlen==0 || indent[curlen-1] != '\n') {
+      indent[curlen] = '\n';
+      indent[curlen+1] = '\0';
+    }
 
-  if(sv) {
-    body = SvPV_nolen(sv);
-  } else {
-    body = "<unformatted message>";
+    /* fmtext_append.  This needs to change */
+    owl_fmtext_append_ztext(fm, indent);
+    
+    owl_free(indent);
+    owl_free(body);
   }
-
-  /* indent and ensure ends with a newline */
-  indent=owl_malloc(strlen(body)+(owl_text_num_lines(body))*OWL_TAB+10);
-  owl_text_indent(indent, body, OWL_TAB);
-  curlen = strlen(indent);
-  if (curlen==0 || indent[curlen-1] != '\n') {
-    indent[curlen] = '\n';
-    indent[curlen+1] = '\0';
-  }
-
-  /* fmtext_append.  This needs to change */
-  owl_fmtext_append_ztext(fm, indent);
-
-  owl_free(indent);
-  if(sv)
-    SvREFCNT_dec(body);
 }
 
 int owl_style_validate(owl_style *s) {
-  if (!s || !s->perlobj || !SvOK(s->perlobj)) {
+  if (!s) {
+    return -1;
+  } else if (s->type==OWL_STYLE_TYPE_INTERNAL) {
+    return 0;
+  } else if (s->type==OWL_STYLE_TYPE_PERL 
+             && s->perlfuncname 
+             && owl_perlconfig_is_function(s->perlfuncname)) {
+    return 0;
+  } else {
     return -1;
   }
-  return 0;
 }
 
@@ -90 +98 @@
 {
   if (s->name) owl_free(s->name);
-  SvREFCNT_dec(s->perlobj);
+  if (s->description) owl_free(s->description);
+  if (s->type==OWL_STYLE_TYPE_PERL && s->perlfuncname) {
+    owl_free(s->perlfuncname);
+  }
 }