Changeset f1e629d for style.c

Timestamp:

Jul 6, 2003, 6:42:06 PM (21 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

5d9c664

Parents:

675ce49

Message:

	New API for perl message formatting functions.
	        Legacy variables are still supported for owl::format_msg
		and owl::receive_msg, but these functions are now also
		passed an owl::Message object which contains methods
		for accessing the contents of the message.  See perlwrap.pm
		(and docs TBD) for the available methods.
		*** WARNING:  The exact API for owl::Message has
		*** not yet stabilized.
	Added "style" command for creating new styles.
	        Usage:  style <name> perl <function_name>
	Added support for "show styles".  Changed global style table
	        from list to dictionary.
	Changed AIM password prompt from "Password:" to "AIM Password:".
	Messages are reformatted after a window resize to allow styles
	        to take into account the width of the window.
	When perl throws an error, the message is put in the msgwin
	        if possible.
	Added perl functions for:
	        owl::getcurmsg() -- returns an owl::Message object for
		                    the active message
		                    in the current view.
	        owl::getnumcols() -- returns the column width of the window
		owl::zephyr_getrealm() -- returns the zephyr realm
	        owl::zephyr_getsender() -- returns the zephyr sender
	Made owl::COMMAND("foo"); be syntactic sugar for
	        owl::command("COMMAND foo");
		*** Is this a good or bad idea?
		*** This feature may be taken out before release.
	Added perlwrap.pm to contain perl code to be compiled into
	        the binary.  This is transformed into perlwrap.c by
		encapsulate.pl.
	Renamed readconfig.c to perlconfig.c and changed variables accordingly.
	Minor bugfixes in cmd.c and commands.c

File:

• style.c (modified) (4 diffs)

style.c

@@ -3 +3 @@
 static const char fileIdent[] = "$Id$";
 
-void owl_style_create_internal(owl_style *s, char *name, void (*formatfunc) (owl_fmtext *fm, owl_message *m))
+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);
+  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)
+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;
 }
@@ -30 +41 @@
 }
 
+char *owl_style_get_description(owl_style *s)
+{
+  return(s->description);
+}
+
 /* Use style 's' to format message 'm' into fmtext 'fm'.
  * 'fm' should already be be initialzed
@@ -41 +57 @@
 
     /* run the perl function */
-    body=owl_config_getmsg(m, s->perlfuncname);
+    body=owl_perlconfig_getmsg(m, 1, s->perlfuncname);
     
     /* indent */
@@ -55 +71 @@
 }
 
+int owl_style_validate(owl_style *s) {
+  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;
+  }
+}
+
 void owl_style_free(owl_style *s)
 {
   if (s->name) owl_free(s->name);
+  if (s->description) owl_free(s->description);
   if (s->type==OWL_STYLE_TYPE_PERL && s->perlfuncname) {
     owl_free(s->perlfuncname);