Changeset f1e629d for owl.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:

• owl.c (modified) (6 diffs)

owl.c

@@ -33 +33 @@
   int newmsgs, zpendcount, nexttimediff;
   struct sigaction sigact;
-  char *configfile, *tty, *perlout, **argvsave, buff[LINE], startupmsg[LINE];
+  char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE];
   owl_filter *f;
   owl_style *s;
@@ -152 +152 @@
   /* setup the built-in styles */
   s=owl_malloc(sizeof(owl_style));
-  owl_style_create_internal(s, "default", &owl_stylefunc_default);
+  owl_style_create_internal(s, "default", &owl_stylefunc_default,
+                            "Default message formatting");
   owl_global_add_style(&g, s);
 
   s=owl_malloc(sizeof(owl_style));
-  owl_style_create_internal(s, "basic", &owl_stylefunc_basic);
+  owl_style_create_internal(s, "basic", &owl_stylefunc_basic,
+                            "Basic message formatting.");
   owl_global_add_style(&g, s);
 
   s=owl_malloc(sizeof(owl_style));
-  owl_style_create_internal(s, "oneline", &owl_stylefunc_oneline);
+  owl_style_create_internal(s, "oneline", &owl_stylefunc_oneline,
+                            "Formats for one-line-per-message");
   owl_global_add_style(&g, s);
 
@@ -224 +227 @@
   /* read the config file */
   owl_context_set_readconfig(owl_global_get_context(&g));
-  ret=owl_readconfig(configfile);
-  if (ret) {
+  perlerr=owl_perlconfig_readconfig(configfile);
+  if (perlerr) {
     endwin();
-    printf("\nError parsing configfile\n");
+    fprintf(stderr, "\nError parsing configfile: %s\n", perlerr);
     exit(1);
   }
@@ -235 +238 @@
     owl_function_debugmsg("Found perl formatting");
     s=owl_malloc(sizeof(owl_style));
-    owl_style_create_perl(s, "perl", "owl::format_msg");
+    owl_style_create_perl(s, "perl", "owl::_format_msg_legacy_wrap",
+                          "User-defined perl style that calls owl::format_msg"
+                          "with legacy global variable support");
     owl_global_add_style(&g, s);
     owl_global_set_default_style(&g, "perl");
   }
 
+  /* set the startup and default style, based on userclue and presence of a
+   * formatting function */
+  if (owl_global_is_config_format(&g)) {
+    owl_global_set_default_style(&g, "perl");
+  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
+    owl_global_set_default_style(&g, "default");
+  } else {
+    owl_global_set_default_style(&g, "basic");
+  }
+
   /* execute the startup function in the configfile */
-  perlout = owl_config_execute("owl::startup();");
+  perlout = owl_perlconfig_execute("owl::startup();");
   if (perlout) owl_free(perlout);
   owl_function_debugmsg("-- Owl Startup --");
@@ -273 +288 @@
   }
 
-  /* set the startup and default style, based on userclue and presence of a
-   * formatting function */
-  if (owl_global_is_config_format(&g)) {
-    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "perl"));
-    owl_global_set_default_style(&g, "perl");
-  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
-    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "default"));
-    owl_global_set_default_style(&g, "default");
-  } else {
-    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "basic"));
-    owl_global_set_default_style(&g, "basic");
-  }
+  owl_view_set_style(owl_global_get_current_view(&g), 
+                     owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   
 
   /* welcome message */
   strcpy(startupmsg, "-------------------------------------------------------------------------\n");
-  sprintf(buff,      "Welcome to Owl version %s.  Press 'h' for on line help. \n", OWL_VERSION_STRING);
+  sprintf(buff,      "Welcome to Owl version %s.  Press 'h' for on-line help. \n", OWL_VERSION_STRING);
   strcat(startupmsg, buff);
   strcat(startupmsg, "                                                                         \n");
@@ -395 +400 @@
 
       /* let the config know the new message has been received */
-      owl_config_getmsg(m, "owl::receive_msg();");
+      owl_perlconfig_getmsg(m, 0, NULL);
 
       /* add it to any necessary views; right now there's only the current view */