Changeset 39dc159

Timestamp:

Mar 1, 2007, 1:52:22 AM (17 years ago)

Author:

Nelson Elhage <nelhage@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:

95caa16

Parents:

2d1feac

git-author:

Nelson Elhage <nelhage@mit.edu> (03/01/07 01:51:51)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/01/07 01:52:22)

Message:

Move handling of the legacy owl::format_msg into perl. It now works
again.

Files:

• owl.c (modified) (2 diffs)
• perlwrap.pm (modified) (1 diff)

owl.c

@@ -316 +316 @@
   owl_aim_init();
 
-  /* if the config defines a formatting function, add 'perl' as a style */
-  if (owl_global_is_config_format(&g)) {
-    owl_function_debugmsg("Found perl formatting");
-    s=owl_malloc(sizeof(owl_style));
-    owl_style_create_perl(s, "perl", "BarnOwl::_format_msg_legacy_wrap",
-                          "User-defined perl style that calls BarnOwl::format_msg"
-                          "with legacy global variable support");
-    owl_global_add_style(&g, s);
-    owl_global_set_default_style(&g, "perl");
-  }
-
   /* execute the startup function in the configfile */
   owl_function_debugmsg("startup: executing perl startup, if applicable");
@@ -407 +396 @@
   }
 
-  owl_function_debugmsg("startup: set style for the view");
+  owl_function_debugmsg("startup: set style for the view: %s", owl_global_get_default_style(&g));
   owl_view_set_style(owl_global_get_current_view(&g), 
                      owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   

perlwrap.pm

@@ -441 +441 @@
         die $@ if $@;
         package BarnOwl;
+        if(*BarnOwl::format_msg{CODE}) {
+            # if the config defines a legacy formatting function, add 'perl' as a style 
+            BarnOwl::_create_style("perl", "BarnOwl::_format_msg_legacy_wrap",
+                                   "User-defined perl style that calls BarnOwl::format_msg"
+                                   . " with legacy global variable support");
+            BarnOwl::set("-q default_style perl");
+        }
     }
 }