Changeset f2f5815

Timestamp:

Nov 2, 2006, 10:19:15 PM (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:

0ff8d110

Parents:

591ea418

Message:

Refactoring hook code

File:

• perlwrap.pm (modified) (9 diffs)

perlwrap.pm

@@ -284 +284 @@
 package owl;
 
-# Arrays of function pointers to be called at specific times.
+# Arrays of subrefs to be called at specific times.
 our @onStartSubs = ();
-our @onReceiveMsg = undef;
-our @onMainLoop = undef;
-our @onGetBuddyList = undef;
+our @onReceiveMsg = ();
+our @onMainLoop = ();
+our @onGetBuddyList = ();
 
 ################################################################################
@@ -306 +306 @@
 $reload = 0;
 
-sub owl::mainloop_hook
-{
-    foreach (@onMainLoop)
-    {
-        &$_();
-    }
-    return;
+# Functions to call hook lists
+sub runHook($@)
+{
+    my $hook = shift;
+    my @args = @_;
+    $_->(@args) for (@$hook);
+}
+
+sub runHook_accumulate($@)
+{
+    my $hook = shift;
+    use Data::Dumper;
+    my @args = @_;
+    return join("\n", map {$_->(@args)} @$hook);
+}
+
+sub mainloop_hook
+{
+    runHook(\@onMainLoop);
 }
 
@@ -318 +330 @@
 # Startup and Shutdown code
 ################################################################################
-sub owl::startup
+sub startup
 {
 # Modern versions of owl provides a great place to have startup stuff.
@@ -325 +337 @@
 }
 
-sub owl::shutdown
+sub shutdown
 {
 # Modern versions of owl provides a great place to have shutdown stuff.
@@ -333 +345 @@
 # should terminate.
     $shutdown = 1;
-    owl::mainloop_hook();
+    mainloop_hook();
 }
 
@@ -347 +359 @@
 
     loadModules();
-    foreach (@onStartSubs)
-    {
-        &$_();
-    }
+    runHook(\@onStartSubs);
 }
 ################################################################################
@@ -395 +404 @@
 ################################################################################
 
-sub loadModules ()
-{
-my @modules;
-foreach my $dir (owl::get_data_dir()."/owl/modules", $ENV{HOME}."/.owl/modules") {
-  opendir(MODULES, $dir);
-  # source ./modules/*.pl
-  @modules  =  grep(/\.pl$/, readdir(MODULES));
-
-foreach my $mod (@modules) {
-  do "$dir/$mod";
-}
-closedir(MODULES);
-}
-}
+sub loadModules () {
+    my @modules;
+    foreach my $dir ( owl::get_data_dir() . "/owl/modules",
+        $ENV{HOME} . "/.owl/modules" )
+    {
+        opendir( MODULES, $dir );
+
+        # source ./modules/*.pl
+        @modules = grep( /\.pl$/, readdir(MODULES) );
+
+        foreach my $mod (@modules) {
+            do "$dir/$mod";
+        }
+        closedir(MODULES);
+    }
+
+}
+
 
 
@@ -415 +428 @@
 ################################################################################
 
-sub owl::receive_msg
+sub receive_msg
 {
     my $m = shift;
-    foreach (@onReceiveMsg)
-    {
-        &$_($m);
-    }
+    runHook(\@onReceiveMsg, $m);
 }
 
@@ -428 +438 @@
 ################################################################################
 
-sub owl::get_blist
+sub get_blist
 {
     my $m = shift;
-    foreach (@onGetBuddyList)
-    {
-        &$_($m);
-    }
+    return runHook_accumulate(\@onGetBuddyList, $m);
 }