Changeset f1e629d

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

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (3 diffs)
• cmd.c (modified) (1 diff)
• commands.c (modified) (7 diffs)
• encapsulate.pl (added)
• examples/owlconf.erik (modified) (8 diffs)
• functions.c (modified) (3 diffs)
• global.c (modified) (3 diffs)
• message.c (modified) (2 diffs)
• owl.c (modified) (6 diffs)
• owl.h (modified) (3 diffs)
• perlconfig.c (added)
• perlglue.xs (modified) (2 diffs)
• perlwrap.pm (added)
• readconfig.c (deleted)
• style.c (modified) (4 diffs)
• util.c (modified) (1 diff)
• variable.c (modified) (2 diffs)
• view.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
+
+2.0.8-pre-2
+        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
 
 2.0.8-pre-1

Makefile.in

@@ -20 +20 @@
 BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
      commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
-     readconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
+     perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
      regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
      keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
-     aim.c buddylist.c timer.c style.c stylefunc.c
+     aim.c buddylist.c timer.c style.c stylefunc.c 
 OWL_SRC = owl.c
 TESTER_SRC = tester.c
@@ -29 +29 @@
 BASE_OBJS = $(BASE_SRCS:.c=.o)
 
-GEN_C = varstubs.c perlglue.c
+GEN_C = varstubs.c perlglue.c perlwrap.c
 GEN_H = owl_prototypes.h 
 GEN_O = $(GEN_C:.c=.o)
@@ -61 +61 @@
 varstubs.c: variable.c stubgen.pl
         perl stubgen.pl > varstubs.c
+
+perlwrap.c: perlwrap.pm encapsulate.pl
+        perl encapsulate.pl perlwrap.pm owl_perlwrap_codebuff > perlwrap.c
 
 # Only move owl_prototypes.h into place if the new one is different

cmd.c

@@ -96 +96 @@
   if (!templ->name) return(-1);
   cmd->name = owl_strdup(templ->name);
-  if (cmd->summary)     cmd->summary     = owl_strdup(templ->summary);
-  if (cmd->usage)       cmd->usage       = owl_strdup(templ->usage);
-  if (cmd->description) cmd->description = owl_strdup(templ->description);
-  if (cmd->cmd_aliased_to) cmd->cmd_aliased_to = owl_strdup(templ->cmd_aliased_to);
+  if (templ->summary)     cmd->summary     = owl_strdup(templ->summary);
+  if (templ->usage)       cmd->usage       = owl_strdup(templ->usage);
+  if (templ->description) cmd->description = owl_strdup(templ->description);
+  if (templ->cmd_aliased_to) cmd->cmd_aliased_to = owl_strdup(templ->cmd_aliased_to);
   return(0);
 }

commands.c

@@ -101 +101 @@
               "Use 'show keymaps' to see the existing keymaps.\n"
               "Key sequences may be things like M-C-t or NPAGE.\n"),
+
+  OWLCMD_ARGS("style", owl_command_style, OWL_CTX_ANY,
+              "creates a new style",
+              "style <name> perl <function_name>",
+              "Creates a new style for formatting messages.\n"
+              "A style named <name> will be created that will\n"
+              "format messages using the perl function <function_name>.\n\n"
+              "SEE ALSO: show styles, view -s, filter -s\n"),
 
   OWLCMD_ARGS("zwrite", owl_command_zwrite, OWL_CTX_INTERACTIVE,
@@ -567 +575 @@
               "show subscriptions\n"
               "show zpunts\n"
+              "show styles\n"
               "show colors\n"
               "show terminal\n"
@@ -583 +592 @@
               "Show commands will list the names of all keymaps.\n"
               "Show command <command> will provide information about a command.\n\n"
+              "Show styles will list the names of all styles available\n"
+              "for formatting messages.\n\n"
               "Show variables will list the names of all variables.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
@@ -1413 +1424 @@
 
   if (argc < 5 || strcmp(argv[3], "command")) {
-    owl_function_makemsg("Usage: bindkey <keymap> <binding> command <cmd>", argv[3], argc);
+    owl_function_makemsg("Usage: bindkey <keymap> <binding> command <cmd>");
     return NULL;
   }
@@ -1430 +1441 @@
   return NULL;
 }
+
+char *owl_command_style(int argc, char **argv, char *buff) {
+  owl_style *s;
+
+  /* Usage: style <name> perl <function> */
+  if (argc != 4 || strcmp(argv[2], "perl")) {
+    owl_function_makemsg("Usage: style <name> perl <function>");
+    return NULL;
+  }
+  if (!owl_perlconfig_is_function(argv[3])) {
+    owl_function_makemsg("Unable to create style '%s': no perl function '%s'",
+                         argv[1], argv[3]);
+    return NULL;
+  }
+  s=owl_malloc(sizeof(owl_style));
+  owl_style_create_perl(s, argv[1], argv[3], NULL);
+  owl_global_add_style(&g, s);
+
+  return NULL;
+}
+
 
 void owl_command_quit()
@@ -1864 +1896 @@
   } else if (!strcmp(argv[1], "colors")) {
     owl_function_show_colors();
+  } else if (!strcmp(argv[1], "styles")) {
+    owl_function_show_styles();
   } else if (!strcmp(argv[1], "subs") || !strcmp(argv[1], "subscriptions")) {
     owl_function_getsubs();
@@ -2115 +2149 @@
   if (argc==2) {
     owl_global_set_buffercommand(&g, buff);
-    owl_function_start_password("Password: ");
+    owl_function_start_password("AIM Password: ");
     return(NULL);
   }

examples/owlconf.erik

@@ -1 +1 @@
 ### The owlconf config file   -*- perl -*-  
 ###  $Id$
-
+###
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
 ### This is an example file intended to demonstrate how to use 
@@ -9 +9 @@
 ### Don't blame me if anything in here ends up vaporizing your dog.
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
-
+###
 ###
 ### This file is interpreted by the perl interpreter.
@@ -24 +24 @@
 ###     owl::startup()     run when owl first starts
 ###     owl::shutdown()    run when owl exits
-###     owl::format_msg()  run when a new message arrives, the return
-###                           value is used to display the message on the
-###                           screen
+###     owl::format_msg()  formats messages that are passed to it
 ###     owl::receive_msg() run when a message is received, and after
 ###                        it has been added to the message list
 ###
-###
-### The following variables will be set each time a message is recevied:
-###
-###     $owl::class, $owl::instance, $owl::recipient,
-###     $owl::sender, $owl::opcode, $owl::zsig,
-###     $owl::msg, $owl::time, $owl::host, @owl::fields, $owl::id
+### The format_msg and receive_msg functions are passed owl::Message objects.
+### The message attributes may be dereferenced with $m->attribute
+###
 ###    
 
@@ -46 +41 @@
 my @sepbartokens = ();
 
+# Map for mail messages from msg id to pop msg id
+my %mail_id_map = ();
+
+# (originally from jdaniel)
+sub mail_add_message ($) {
+    my ($m) = @_;
+    my $from = `from -t`;
+    # example value:
+    # You have 188 messages (667593 bytes) on PO11.MIT.EDU.
+    my ($msg_num) = $from =~ m/(\d+)/;
+    $mail_id_map{$m->id} = $msg_num;
+}
+
+
+sub mail_pop_curmsg () {
+    my $m = owl::getcurmsg();
+    if (!$m->is_mail || !defined $mail_id_map{$m->id}) {
+        &owl::command("pop-message");
+    } else {
+        &owl::command(sprintf 'pexec pop -request c -request "retr %d" -request q',
+                      $mail_id_map{$m->id});
+    }
+}
+
+sub zlocatesender {
+    my $m = owl::getcurmsg();
+    if ($m->{"type"} eq "zephyr") {
+        my $sender = $m->{"sender"};
+        owl::command("zlocate $sender");
+    }
+}
 
 # adds a sepbartoken and also updates the appendtosepbar variable
@@ -63 +89 @@
 }
 
+my $loopctr=0;
+
 # trims a sepbartoken from the list also updates the appendtosepbar variable
 sub sepbartokens_set {
-    owl::command(sprintf "set -q appendtosepbar \"%s\"", (join " ", @sepbartokens));
+    owl::command(sprintf "set -q appendtosepbar \"%s %s %s\"", (scalar localtime), (join " ", @sepbartokens));
 }
 
@@ -73 +101 @@
     if ($restoreview) {
         owl::command("view $restoreview");
-        $restoreview = undef;
-    } else {
-        $restoreview = $curview;
-        owl::command("smartnarrow");
+        $restoreview = undef;
+    } else {
+        $restoreview = $curview;
+        owl::command("smartnarrow");
     }
 }
@@ -91 +119 @@
     } else {
         owl::command("filter $smartfilt -c green");
-        $lastcolored = $smartfilt;
+        $lastcolored = $smartfilt;
+    }
+}
+
+# Load in things which don't belong in an owlconf 
+# that people might use as an example...
+sub personal_startup {
+    my $personalconf = $ENV{"HOME"}."/.owl/personalconf";
+    if (-f $personalconf) {
+        my $b = "";
+        open INB, $personalconf;
+        for (<INB>) { $b .= $_; }
+        close INB;
+        eval $b;
     }
 }
 
 sub owl::startup {
-    owl::command("set -q logging off");
-    owl::command("set -q zsigproc /home/nygren/bin/owlzsigs");
+    owl::command("set -q logging on");
+    owl::command("set -q logpath ~/.zlog/owl/personal");
+    owl::command("set -q classlogpath ~/.zlog/owl/class");
+    owl::command("set -q logging on");
     owl::command("set -q startuplogin off");
     owl::command("set -q shutdownlogout off");
     #owl::command("set personalbell on");
+    owl::command("set -q _burningears on");
     owl::command("set -q rxping on");
     owl::command("set -q typewinsize 5");
-    if ($ENV{"DISPLAY"} eq ":0") {
+    if ($ENV{"DISPLAY"} eq ":0.0") {
       owl::command("set -q webbrowser galeon"); 
     }
-    owl::command("filter me recipient ".$ENV{"USER"});
-    owl::command("filter help class help");
-    owl::command("filter quiet not ( class ^greed|geek|help|login$ or instance white-magic )");    
+    owl::command("filter me recipient %me% or ( sender %me% and class message and instance personal ) or class mail or type aim");
+    owl::command("filter owl instance ^owl.*");
+
+    owl::command(q(alias finger pperl $x=owl::getcurmsg()->hostname; `finger \@$x`;));
+    owl::command("bindkey recv f command finger");
 
     owl::command("alias z zwrite");
-    owl::command("alias zc zwrite -c");
-
-    # Send zephyrs with "C-c C-c".  
-    # Note that this will cause "C-c" to not work...
-    owl::command("bindkey editmulti \"C-c C-c\" command editmulti:done");
-
-    # Make "d" ignore current movement direction
-    owl::command("bindkey recv d command ( delete --no-move ; next --skip-deleted )");
-
-    # Useful keys for reading and deleting by class/instance
+    owl::command("alias zw zwrite");
+    owl::command("alias v view");
+
+    owl::command("alias popmail perl mail_pop_curmsg();");
+
+    # toggle between a view and a smartnarrow with TAB
+    owl::command("alias swapview perl swapview();");
+    owl::command("bindkey recv C-i command swapview");
+
+    # color the current thread
+    owl::command("alias colorthread perl colorthread();");
+    owl::command("bindkey recv M-c command colorthread");
+
+    # zlocate current sender
+    owl::command("bindkey recv L command perl zlocatesender();");
+
+    # Declare styles
+    &owl::command("style vt     perl format_msg_vt");
+    &owl::command("style brief  perl format_msg_brief");
+    &owl::command("style custom perl format_msg_custom");
+    &owl::command("style debug  perl format_msg_debug");
+    &owl::command("set -q default_style custom");
+
+    # Change to different view styles
+    owl::command("bindkey recv \"C-s v\" command view -s vt");
+    owl::command("bindkey recv \"C-s c\" command view -s custom");
+    owl::command("bindkey recv \"C-s b\" command view -s brief");
+    owl::command("bindkey recv \"C-s d\" command view -s debug");
+    owl::command("bindkey recv \"C-s o\" command view -s standard");
+
+    # For fast-reading of zephyrs
     owl::command("bindkey recv M-k command ( smartnarrow ; delete view )");
     owl::command("bindkey recv M-l command ( expunge ; view all )");
     owl::command("bindkey recv M-K command ( smartnarrow ; delete view ; expunge ; view all )");
 
-    # Toggle between a view and a smartnarrow with TAB.
-    # Note that you probably want to use something other than TAB as 
-    # it will have another binding in a future version of owl.
-    owl::command("alias swapview perl swapview();");
-    owl::command("bindkey recv C-i command swapview");
-
-    # color the current thread
-    owl::command("alias colorthread perl colorthread();");
-    owl::command("bindkey recv M-c command colorthread");
-
-    # Make 'M-s' insert a <scritchscritchscritch> sequence with a random
-    # number of scritches.
-    owl::command(q(bindkey edit M-s command perl owl::command("edit:insert-text <".("scritch"x int(1+rand(5))).">")));
-
+    # Support for scroll mice
+    &owl::command("bindkey recv \"M-[ A\" command recv:prev");
+    &owl::command("bindkey recv \"M-[ B\" command recv:next");
+
+    # This overrides the default "M" keybinding
+    owl::command("bindkey recv M command popmail");
+
+    sepbartokens_add("...");
+
+    personal_startup();
 }
 
@@ -145 +208 @@
 }
 
+
+# run when a message is received, and after
+# it has been added to the message list.
+sub owl::receive_msg {
+    my ($m) = @_;
+    my ($out, $tmp);
+
+    if ($m->is_admin && !$m->is_outgoing) {
+        $m->delete();
+        return 1;
+    }
+
+    return 0 if (!$m->is_zephyr && !$m->is_aim);
+
+    my $sender = $m->pretty_sender;
+
+    if ($m->is_ping) {
+        sepbartokens_add(".$sender");
+        $m->delete();
+    } elsif ($m->is_loginout) {
+        $m->delete();
+        if ($m->is_login) {
+            sepbartokens_add(">$sender");
+            sepbartokens_trim("<$sender");
+        } elsif ($m->is_logout) {
+            sepbartokens_add("<$sender");
+            sepbartokens_trim(">$sender");
+        } 
+    } elsif ($m->is_mail) {
+        mail_add_message($m);
+        $m->delete();
+        sepbartokens_add("M");
+    }
+
+    if ($m->is_personal) {
+        sepbartokens_trim(".$sender");
+        sepbartokens_add(":$sender");
+    }
+
+    return 1;
+}
+
+sub indent4 {
+    my ($b) = @_;
+    $b=~s/^/    /g;
+    $b=~s/\n/\n    /g;    
+    return $b;
+}
+
 # run to format a message
-sub owl::format_msg {
-    my $out, $tmp;
-
-    $owl::sender=~s/\@ATHENA\.MIT\.EDU$//;
-    $owl::sender=~s/\@local-realm$//;
-
-    if (uc($owl::opcode) eq "PING") {
-        return("\@bold(PING) from \@bold($owl::sender)\n");
-    } elsif (uc($owl::class) eq "LOGIN") {
-        if (uc($owl::opcode) eq "USER_LOGIN") {
+sub format_msg_custom {
+    my ($m) = @_;
+    my ($out, $tmp);
+
+    if ($m->is_admin) {
+        $out = "\@bold([owl admin]) ".$m->header."\n";
+        $out.=indent4($m->body);
+        return $out."\n";
+    }
+
+    my $sender=$m->pretty_sender;
+
+    if (($m->is_aim or $m->is_zephyr) && $m->is_loginout) {
+
+        if ($m->is_login) {
             $out="\@bold(LOGIN)";
-        } elsif (uc($owl::opcode) eq "USER_LOGOUT") {
+        } elsif ($m->is_logout) {
             $out="\@bold(LOGOUT)";
         } else {
             $out="\@bold(UNKNOWN)";
         }
-        $out.=" for \@bold($owl::sender) at $fields[0] on $fields[2]\n";
+        $out.=" for \@bold($sender) on ".$m->type;
+        if ($m->is_zephyr) {
+            $out.=" at ".($m->login_host)." on ".($m->login_tty)."\n";
+        }
         return($out);
-    } elsif (uc($owl::class) eq "MAIL" and uc($owl::instance) eq "INBOX") {
+    }
+
+    if (!$m->is_zephyr && !$m->is_aim) { 
+        return "Unknown message type: ".$m->type."\n";
+    }
+
+    if ($m->is_outgoing) {
+        my $target = $m->recipient;
+        if ($m->is_zephyr) {
+            $target = $m->zwriteline;
+            $target =~ s/^zwrite //;
+        }
+        $out = sprintf "\@bold([outgoing %s to %s]) / %s\n", $m->type, $target, $m->time;
+        $out.=indent4($m->body);
+        return $out;
+    }
+
+    if ($m->is_zephyr && $m->is_ping) {
+        return("\@bold(PING) from \@bold($sender)\n");
+    } elsif ($m->is_zephyr && $m->is_mail) {
         $out = "\@bold(MAIL) ";
-        if ($owl::msg =~ /^From:\s+(.+)\s*$/m) { $out .= "From $1 "; }
-        if ($owl::msg =~ /^To:\s+(.+)\s*$/m) { $out .= "To $1 "; }
-        if ($owl::msg =~ /^Subject:\s+(.+)\s*$/m) { $out .= "Subject $1 "; }
+        if ($m->body =~ /^From:\s+(.+)\s*$/m) { $out .= "From $1 "; }
+        if ($m->body =~ /^To:\s+(.+)\s*$/m) { $out .= "To $1 "; }
+        if ($m->body =~ /^Subject:\s+(.+)\s*$/m) { $out .= "Subject $1 "; }
+        return($out);
+    }
+
+    if ($m->is_zephyr) {
+        $out = sprintf "[mit,%s,%s] / %s / %s", lc($m->class), 
+        lc($m->instance), $m->time, lc($m->host);
+        if ($m->opcode ne "") {$out.=" op:".$m->opcode;}
+        $out.="\n";
+        $out.= "  \@bold($sender)> ";
+        if ($m->zsig ne "") {
+            my $zsig = $m->zsig;
+            $zsig =~ s/(\n.*)+$/ [...]/;
+            if (length($zsig)+5+length($sender) > 70) {
+                $out.="# ...";
+            } else {
+                $out.="# $zsig";
+            }
+        }
+        $out.="\n";             
+    } else {
+        $out = sprintf "[%s] / %s\n", lc($m->type), $m->time;
+        $out.= "  \@bold($sender)> ";
+        $out.="\n";             
+    }
+
+    $out.=indent4($m->body);
+
+    # make personal messages bold
+    if ($m->is_personal) {
+        $out="\@bold{".$out."}";
+    }
+
+    return($out."\n");
+}
+
+sub format_msg_debug {
+    my ($m) = @_;
+    return "\@bold(-------------MESSAGE-------------)\n".($m->serialize).".\n";
+}
+
+sub format_msg_brief {
+    my ($m) = @_;
+    my $out = format_msg_vt($m);
+    $out =~ s/\n/ /g;
+    $out =~ s/                        / /g;
+    return($out."\n");
+}
+
+
+sub format_msg_vt {
+    my ($m) = @_;
+    my ($out, $tmp);
+
+    if ($m->is_admin) {
+        $out = sprintf "%-29s \@i(%s)", "\@bold(OWL ADMIN)", $m->header;
+        $tmp=$m->body;
+        $tmp=~s/^/                       /g;
+        $tmp=~s/\n/\n                       /g;
+        $out.="\n".$tmp;
+        return $out;
+    }
+
+    my $sender=$m->pretty_sender;
+
+    if ($m->is_outgoing) {
+        my $target = $m->recipient;
+        if ($m->is_zephyr) {
+            $target = $m->zwriteline;
+            $target =~ s/^zwrite //;
+        }
+        $out = sprintf "%-15s %-13s", "\@bold(OUTGOING)", "to $target via ".$m->type.": ";
+        my $pagewidth = owl::getnumcols()-6;
+        $out .= fill_text($m->body, $pagewidth, 22, 1);
+        return $out;
+    }
+
+    if (!$m->is_zephyr && !$m->is_aim) { 
+        return "Unknown message type: ".$m->type."\n";
+    }
+
+    if ($m->is_zephyr && $m->is_ping) {
+        return (sprintf "%-15s %-13s\n", "\@bold(PING)", $sender);
+    } elsif ($m->is_loginout) {
+        my $state;
+        if ($m->is_login) {
+            $state="\@bold(LOGIN)";
+        } elsif ($m->is_logout) {
+            $state="\@bold(LOGOUT)";
+        } else {
+            $state="\@bold(UNKNOWN)";
+        }
+        my $out = sprintf "%-15s %-13s ", $state, $sender;
+        if ($m->is_zephyr) {
+            $out .= sprintf "via %s on %s at %s", $m->type, $m->login_host, $m->login_tty;
+        } else {
+            $out .= sprintf "via %s", $m->type;
+        }
+        return "$out\n";
+                
+    } elsif ($m->is_zephyr && $m->is_mail) {
+        my $body = $m->body;
+        $out = sprintf "%-15s %-13s ", "\@bold(MAIL)", "";
+        if ($body =~ /^From:\s+(.+)\s*$/m) { $out .= "From $1 "; }
+        if ($body =~ /^To:\s+(.+)\s*$/m) { $out .= "To $1 "; }
+        if ($body =~ /^Subject:\s+(.+)\s*$/m) { $out .= "Subject $1 "; }
         return($out."\n");
     }
 
-    $out = sprintf "[mit,%s,%s] / %s / %s", lc($owl::class), 
-                   lc($owl::instance), $owl::time, lc($owl::host);
-    if ($owl::opcode ne "") {$out.=" op:$owl::opcode";}
-    $out.="\n";
-    $out.= "  \@bold($owl::sender)> ";
-    if ($owl::zsig ne "") {
-        my $zsig = $owl::zsig;
-        $zsig =~ s/(\n.*)+$/ [...]/;
-        if (length($zsig)+5+length($owl::sender) > 70) {
-            $out.="# ...";
-        } else {
-            $out.="# $zsig";
-        }
-    }
-    $out.="\n";         
-
-    # indent it
-    $tmp=$owl::msg;
-    $tmp=~s/^/    /g;
-    $tmp=~s/\n/\n    /g;
-    $out.=$tmp;
+    my $channel = "";
+    my $body = $m->body;
+    
+    if ($m->is_zephyr) {
+        my $inst = $m->instance;
+        $channel = $m->class;
+        if (lc($m->class) ne "message" and lc($m->instance) eq "personal") {
+            $inst = "";
+        }
+        $channel .= "[".$inst."]";
+        $channel = substr($channel,0,13);
+    } else {
+        $channel = "[".$m->type."]";
+    }
+
+    $header = sprintf "%-8s %-13s ", lc($sender), lc($channel);
+
+    if ($body =~ /=/) {
+        # indent it
+        $out.=$header."\n".indent4($body);
+    } else {
+        # fill it
+        my $pagewidth = owl::getnumcols()-6;
+        $out .= $header;
+        $out .= fill_text($body, $pagewidth, 22, 1);
+    }
+
+    # note: no zsig added in this version
 
     # make personal messages bold
-    if (uc($owl::class) eq "MESSAGE" &&
-        uc($owl::instance) eq "PERSONAL") {
+    if ($m->is_personal) {
         $out="\@bold{".$out."}";
     }
-
-    return($out."\n");
-}
-
-# run when a message is received, and after
-# it has been added to the message list.
-sub owl::receive_msg() {
-    my $out, $tmp;
-
-    $owl::sender=~s/\@ATHENA\.MIT\.EDU$//;
-    $owl::sender=~s/\@local-realm$//;
-
-    if (uc($owl::opcode) eq "PING") {
-        sepbartokens_add(".$owl::sender");
-        owl::command("delete -id $owl::id");
-    } elsif (uc($owl::class) eq "LOGIN") {
-        owl::command("delete -id $owl::id");
-        if (uc($owl::opcode) eq "USER_LOGIN") {
-            sepbartokens_add(">$owl::sender");
-            sepbartokens_trim("<$owl::sender");
-        } elsif (uc($owl::opcode) eq "USER_LOGOUT") {
-            sepbartokens_add("<$owl::sender");
-            sepbartokens_trim(">$owl::sender");
-        } 
-    } elsif (uc($owl::class) eq "MAIL") {
-        owl::command("delete -id $owl::id");
-        sepbartokens_add("M");
-    }
-
-
-    # make personal messages bold
-    if (uc($owl::class) eq "MESSAGE" &&
-        uc($owl::instance) eq "PERSONAL") {
-        sepbartokens_trim(".$owl::sender");
-        sepbartokens_add(":$owl::sender");
-    }
-
-    return 1;
-}
+    return($out);
+}
+
+sub fill_text {
+    my ($in, $width, $indent, $unindent_first) = @_;
+    $indent = 0 if (@_ < 3);
+    my $unindent = $indent if ($unindent_first);
+    my @words = split " ", $in;
+    my $out = "";
+    my $outline = "";
+    if (!$unindent_first) {
+        my $outline = " "x$indent;
+    }
+    for my $w (@words) {
+        if (($outline ne "") 
+            && (length($outline)+length($w) > $width-$unindent)) {
+            $out .= $outline."\n";
+            $outline = " "x$indent;
+            $unindent = 0;
+        }
+        if ($outline =~ /.*\.$/) {
+            $outline .= "  ";
+        } elsif ($outline ne "") {
+            $outline .= " ";
+        }
+        $outline .= $w;
+    }
+    $out .= $outline . "\n";    
+}

functions.c

@@ -78 +78 @@
 }
 
+void owl_function_show_styles() {
+  owl_list l;
+  owl_fmtext fm;
+
+  owl_fmtext_init_null(&fm);
+  owl_fmtext_append_bold(&fm, "Styles:\n");
+  owl_global_get_style_names(&g, &l);
+  owl_fmtext_append_list(&fm, &l, "\n", owl_function_style_describe);
+  owl_fmtext_append_normal(&fm, "\n");
+  owl_function_popless_fmtext(&fm);
+  owl_list_free_all(&l, owl_free);
+  owl_fmtext_free(&fm);
+}
+
+char *owl_function_style_describe(void *name) {
+  char *desc, *s;
+  owl_style *style;
+  style = owl_global_get_style_by_name(&g, name);
+  if (style) {
+    desc = owl_style_get_description(style);
+  } else {
+    desc = "???";
+  }
+  s = owl_sprintf("%-20s - %s%s", name, 
+                  0==owl_style_validate(style)?"":"[INVALID] ",
+                  desc);
+  return s;
+}
 
 char *owl_function_cmd_describe(void *name)
@@ -741 +769 @@
 
   /* execute the commands in shutdown */
-  ret = owl_config_execute("owl::shutdown();");
+  ret = owl_perlconfig_execute("owl::shutdown();");
   if (ret) owl_free(ret);
 
@@ -2051 +2079 @@
   buff = skiptokens(buff, 1);
 
-  perlout = owl_config_execute(buff);
+  perlout = owl_perlconfig_execute(buff);
   if (perlout) { 
     if (type==1) {

global.c

@@ -53 +53 @@
   owl_list_create(&(g->puntlist));
   owl_list_create(&(g->messagequeue));
-  owl_list_create(&(g->stylelist));
+  owl_dict_create(&(g->styledict));
   g->curmsg_vert_offset=0;
   g->resizepending=0;
@@ -390 +390 @@
   _owl_global_setup_windows(g);
 
+  /* in case any styles rely on the current width */
+  owl_messagelist_invalidate_formats(owl_global_get_msglist(g));
+
   /* refresh stuff */
   g->needrefresh=1;
@@ -774 +777 @@
 owl_style *owl_global_get_style_by_name(owl_global *g, char *name)
 {
-  int i, j;
-  owl_style *s;
-  
-  j=owl_list_get_size(&(g->stylelist));
-  for (i=0; i<j; i++) {
-    s=owl_list_get_element(&(g->stylelist), i);
-    if (owl_style_matches_name(s, name)) {
-      return(s);
-    }
-  }
-  return(NULL);
+  return owl_dict_find_element(&(g->styledict), name);
+}
+
+/* creates a list and fills it in with keys.  duplicates the keys, 
+ * so they will need to be freed by the caller. */
+int owl_global_get_style_names(owl_global *g, owl_list *l) {
+  return owl_dict_get_keys(&(g->styledict), l);
 }
 
 void owl_global_add_style(owl_global *g, owl_style *s)
 {
-  owl_list_append_element(&(g->stylelist), s);
+  owl_dict_insert_element(&(g->styledict), owl_style_get_name(s), 
+                          s, (void(*)(void*))owl_style_free);
 }
 

message.c

@@ -574 +574 @@
 }
 
+char *owl_message_get_type(owl_message *m) {
+  switch (m->type) {
+  case OWL_MESSAGE_TYPE_ADMIN:
+    return("admin");
+  case OWL_MESSAGE_TYPE_ZEPHYR:
+    return("zephyr");
+  case OWL_MESSAGE_TYPE_GENERIC:
+    return("generic");
+  case OWL_MESSAGE_TYPE_AIM:
+    return("aim");
+  case OWL_MESSAGE_TYPE_JABBER:
+    return("jabber");
+  case OWL_MESSAGE_TYPE_ICQ:
+    return("icq");
+  case OWL_MESSAGE_TYPE_YAHOO:
+    return("yahoo");
+  case OWL_MESSAGE_TYPE_MSN:
+    return("msn");
+  default:
+    return("unknown");
+  }
+}
+
+char *owl_message_get_direction(owl_message *m) {
+  switch (m->direction) {
+  case OWL_MESSAGE_DIRECTION_IN:
+    return("in");
+  case OWL_MESSAGE_DIRECTION_OUT:
+    return("out");
+  case OWL_MESSAGE_DIRECTION_NONE:
+    return("none");
+  default:
+    return("unknown");
+  }
+}
+
+char *owl_message_get_login(owl_message *m) {
+  if (owl_message_is_login(m)) {
+    return "login";
+  } else if (owl_message_is_logout(m)) {
+    return "logout";
+  } else {
+    return "none";
+  }
+}
+
+char *owl_message_get_header(owl_message *m) {
+  return owl_message_get_attribute_value(m, "adminheader");
+}
+
 /* return 1 if the message contains "string", 0 otherwise.  This is
  * case insensitive because the functions it uses are
@@ -798 +848 @@
   owl_fmtext_free(&(m->fmtext));
 }
+
+

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 */

owl.h

@@ -21 +21 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.8-pre-1
-#define OWL_VERSION_STRING "2.0.8-pre-1"
+#define OWL_VERSION         2.0.8-pre-2
+#define OWL_VERSION_STRING "2.0.8-pre-2"
 
 #define OWL_DEBUG 0
@@ -274 +274 @@
 typedef struct _owl_style {
   char *name;
+  char *description;
   int type;
   char *perlfuncname;
@@ -451 +452 @@
   owl_buddylist buddylist;  /* list of logged in AIM buddies */
   owl_list messagequeue;    /* for queueing up aim and other messages */
-  owl_list stylelist;       /* global list of available styles */
+  owl_dict styledict;       /* global dictionary of available styles */
   char *response;           /* response to the last question asked */
   int havezephyr;

perlglue.xs

@@ -1 +1 @@
 static const char fileIdent[] = "$Id$";
 
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
+#include <zephyr/zephyr.h>
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
 
 /* Yeah, we should just include owl.h, but curses and perl don't play nice. */
-extern char *owl_function_command(char *);
-extern void owl_free(void *);
+extern char *owl_function_command(char *cmd);
+extern void owl_free(void *x);
+extern SV *owl_perlconfig_curmessage2hashref();
 extern int owl_zwrite_create_and_send_from_line(char *, char *);
 extern char *owl_function_ztext_stylestrip(char *);
+extern void g;
+extern int owl_global_get_cols(void*);
 
 MODULE = owl            PACKAGE = owl           
@@ -26 +30 @@
                 if (rv) owl_free(rv);
 
+SV *
+getcurmsg()
+        CODE:
+                ST(0) = owl_perlconfig_curmessage2hashref();
+
+int
+getnumcols()
+        CODE:
+                RETVAL = owl_global_get_cols(&g);
+        OUTPUT:
+                RETVAL
+
+char *
+zephyr_getrealm()
+        CODE:
+                RETVAL = ZGetRealm();
+        OUTPUT:
+                RETVAL
+
+char *
+zephyr_getsender()
+        CODE:
+                RETVAL = ZGetSender();
+        OUTPUT:
+                RETVAL
+
 void
-send_zwrite(cmd,msg)
+zephyr_zwrite(cmd,msg)
         char *cmd
         char *msg

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);

util.c

@@ -283 +283 @@
 char *owl_util_minutes_to_timestr(int in)
 {
-  int days, minutes, hours;
+  int days, hours;
   long run;
   char *out;

variable.c

@@ -204 +204 @@
   OWLVAR_STRING( "default_style" /* %OwlVarStub */, "default",
                  "name of the default formatting style",
-                 "This sets the default message formatting style. Possbile\n"
-                 "values include 'default' 'basic' 'oneline' and if\n"
-                 "available, 'perl'\n" ),
+                 "This sets the default message formatting style.\n"
+                 "Styles may be created with the 'style' command.\n"
+                 "Some built-in styles include:\n"
+                 "   default  - the default owl formatting\n"
+                 "   basic    - simple formatting\n"
+                 "   oneline  - one line per-message\n"
+                 "   perl     - legacy perl interface\n"
+                 "\nSEE ALSO: style, show styles, view -s <style>\n"
+                 ),
+
 
   OWLVAR_INT(    "edit:maxfillcols" /* %OwlVarStub:edit_maxfillcols */, 70,
@@ -356 +363 @@
   owl_zephyr_set_locationinfo(owl_global_get_hostname(&g), newval);
   return(owl_variable_string_set_default(v, newval));
-}
-
-int owl_variable_style_set(owl_variable *v, void *newval) {
-  /* Invalidate all message formats first */
-  int ret;
-  owl_style *s;
-
-  s=owl_global_get_style_by_name(&g, newval);
-  if (!s) {
-    /* this message won't get seen, we'll need to deal with that later */
-    owl_function_makemsg("No style named '%s' exists.", newval);
-    return(0);
-  }
-  
-  owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
-  ret=owl_variable_string_set_default(v, newval);
-  owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  return(ret);
 }
 

view.c

@@ -67 +67 @@
 {
   return(v->style);
+}
+
+char *owl_view_get_style_name(owl_view *v) {
+  return(owl_style_get_name(v->style));
 }
 

zephyr.c

@@ -731 +731 @@
 #endif
 
-
 /* returns a buffer of subscriptions or an error message.
  * Caller must free the return.