commit 1c61b3babcdd4a18c1a1eb861fa582cb01e2ea9b
author Patrik Stridvall <ps@leissner.se> Mon Jul 23 23:20:56 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 23 23:20:56 2001 +0000
tree 54ee759ca284755fa34e7644bcfaeb2d6c0e6058
parent 5dda1f7e2cb7cf52f52c31099c680ff37d3456e5

Yet another major reorganization and a few new features.

tools/winapi/output.pm

diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm
index 1b46172..7c9bf0d 100644
--- a/tools/winapi/output.pm
+++ b/tools/winapi/output.pm
@@ -2,22 +2,16 @@
 
 use strict;
 
-my $_output;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+require Exporter;
 
-sub new {
-    my $self = shift;
-    $_output = _output->new(@_);
-    return $_output;
-}
+@ISA = qw(Exporter);
+@EXPORT = qw();
+@EXPORT_OK = qw($output);
 
-sub AUTOLOAD {
-    my $self = shift;
+use vars qw($output);
 
-    my $name = $output::AUTOLOAD;
-    $name =~ s/^.*::(.[^:]*)$/$1/;
-
-    return $_output->$name(@_);
-}
+$output = '_output'->new;
 
 package _output;
 
@@ -37,17 +31,18 @@
     my $last_time = \${$self->{LAST_TIME}};
     my $progress_count = \${$self->{PROGRESS_COUNT}};
     my $prefix = \${$self->{PREFIX}};
+    my $prefix_callback = \${$self->{PREFIX_CALLBACK}};
 
     $$progress = "";
     $$last_progress = "";
     $$last_time = 0;
     $$progress_count = 0;
-    $$prefix = "";
+    $$prefix = undef;
+    $$prefix_callback = undef;
 
     return $self;
 }
 
-
 sub show_progress {
     my $self = shift;
     my $progress = \${$self->{PROGRESS}};
@@ -134,8 +129,20 @@
 sub prefix {
     my $self = shift;
     my $prefix = \${$self->{PREFIX}};
+    my $prefix_callback = \${$self->{PREFIX_CALLBACK}};
 
     $$prefix = shift;
+    $$prefix_callback = undef;
+}
+
+sub prefix_callback {
+    my $self = shift;
+
+    my $prefix = \${$self->{PREFIX}};
+    my $prefix_callback = \${$self->{PREFIX_CALLBACK}};
+
+    $$prefix = undef;
+    $$prefix_callback = shift;
 }
 
 sub write {
@@ -144,9 +151,16 @@
     my $message = shift;
 
     my $prefix = \${$self->{PREFIX}};
+    my $prefix_callback = \${$self->{PREFIX_CALLBACK}};
 
     $self->hide_progress if $stdout_isatty;
-    print $$prefix . $message;
+    if(defined($$prefix)) {
+	print $$prefix . $message;
+    } elsif(defined($$prefix_callback)) {
+	print &{$$prefix_callback}() . $message;
+    } else {
+	print $message;
+    }
     $self->show_progress if $stdout_isatty;
 }