--- AnyEvent/lib/AnyEvent.pm	2006/12/10 21:33:33	1.18
+++ AnyEvent/lib/AnyEvent.pm	2006/12/10 23:59:15	1.19
@@ -91,9 +91,9 @@
       undef $w;
    });
 
-=head2 TIMER WATCHERS
+=head2 TIME WATCHERS
 
-You can create a timer watcher by calling the C<< AnyEvent->timer >>
+You can create a time watcher by calling the C<< AnyEvent->timer >>
 method with the following mandatory arguments:
 
 C<after> after how many seconds (fractions are supported) should the timer
@@ -159,6 +159,18 @@
 
 =back
 
+=head2 SIGNAL WATCHERS
+
+You can listen for signals using a signal watcher, C<signal> is the signal
+I<name> without any C<SIG> prefix.
+
+These watchers might use C<%SIG>, so programs overwriting those signals
+directly will likely not work correctly.
+
+Example: exit on SIGINT
+
+   my $w = AnyEvent->signal (signal => "INT", cb => sub { exit 1 });
+
 =head1 GLOBALS
 
 =over 4
@@ -179,6 +191,12 @@
    AnyEvent::Impl::Tk        based on Tk, very bad choice.
    AnyEvent::Impl::Perl      pure-perl implementation, inefficient.
 
+=item AnyEvent::detect
+
+Returns C<$AnyEvent::MODEL>, forcing autodetection of the event model if
+necessary. You should only call this function right before you would have
+created an AnyEvent watcher anyway, that is, very late at runtime.
+
 =back
 
 =head1 WHAT TO DO IN A MODULE
@@ -216,10 +234,10 @@
 package AnyEvent;
 
 no warnings;
-use strict 'vars';
+use strict;
 use Carp;
 
-our $VERSION = '2.1';
+our $VERSION = '2.5';
 our $MODEL;
 
 our $AUTOLOAD;
@@ -237,15 +255,12 @@
    [AnyEvent::Impl::Perl:: => AnyEvent::Impl::Perl::],
 );
 
-our %method = map +($_ => 1), qw(io timer condvar broadcast wait DESTROY);
-
-sub AUTOLOAD {
-   (my $func = $AUTOLOAD) =~ s/.*://;
-
-   $method{$func}
-      or croak "$func: not a valid method for AnyEvent objects";
+our %method = map +($_ => 1), qw(io timer condvar broadcast wait signal one_event DESTROY);
 
+sub detect() {
    unless ($MODEL) {
+      no strict 'refs';
+
       # check for already loaded models
       for (@REGISTRY, @models) {
          my ($package, $model) = @$_;
@@ -271,16 +286,58 @@
          }
 
          $MODEL
-           or die "No event module selected for AnyEvent and autodetect failed. Install any one of these modules: Coro, Event, Glib or Tk.";
+           or die "No event module selected for AnyEvent and autodetect failed. Install any one of these modules: Event (or Coro+Event), Glib or Tk.";
       }
+
+      unshift @ISA, $MODEL;
+      push @{"$MODEL\::ISA"}, "AnyEvent::Base";
    }
 
-   @ISA = $MODEL;
+   $MODEL
+}
+
+sub AUTOLOAD {
+   (my $func = $AUTOLOAD) =~ s/.*://;
+
+   $method{$func}
+      or croak "$func: not a valid method for AnyEvent objects";
+
+   detect unless $MODEL;
 
    my $class = shift;
    $class->$func (@_);
 }
 
+package AnyEvent::Base;
+
+# default implementation for signal
+
+our %SIG_CB;
+
+sub signal {
+   my (undef, %arg) = @_;
+
+   my $signal = uc $arg{signal}
+      or Carp::croak "required option 'signal' is missing";
+
+   my $w = bless [$signal, $arg{cb}], "AnyEvent::Base::Signal";
+
+   $SIG_CB{$signal}{$arg{cb}} = $arg{cb};
+   $SIG{$signal} ||= sub {
+      $_->() for values %{ $SIG_CB{$signal} };
+   };
+
+   $w
+}
+
+sub AnyEvent::Base::Signal::DESTROY {
+   my ($signal, $cb) = @{$_[0]};
+
+   delete $SIG_CB{$signal}{$cb};
+
+   $SIG{$signal} = 'DEFAULT' unless keys %{ $SIG_CB{$signal} };
+}
+
 =head1 SUPPLYING YOUR OWN EVENT MODEL INTERFACE
 
 If you need to support another event library which isn't directly
@@ -299,7 +356,7 @@
 AnyEvent is loaded and asked to find a suitable event model, it will
 first check for the presence of urxvt.
 
-The class should prove implementations for all watcher types (see
+The class should provide implementations for all watcher types (see
 L<AnyEvent::Impl::Event> (source code), L<AnyEvent::Impl::Glib>
 (Source code) and so on for actual examples, use C<perldoc -m
 AnyEvent::Impl::Glib> to see the sources).