[ViewVC] Diff of: cvs/rxvt-unicode/src/urxvt.pm

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.109 by root, Thu Jan 19 16:07:09 2006 UTC vs.
Revision 1.113 by root, Fri Jan 20 10:27:08 2006 UTC

 find them in F<@@RXVT_LIBDIR@@/urxvt/perl/>.
 You can activate them like this:
   @@RXVT_NAME@@ -pe <extensionname>
+Or by adding them to the resource for extensions loaded by default:
+  URxvt.perl-ext-common: default,automove-background,selection-autotransform
 =over 4
 =item selection (enabled by default)
 Binds a popup menu to Ctrl-Button3 that lets you convert the selection
 text into various other formats/action (such as uri unescaping, perl
 evalution, web-browser starting etc.), depending on content.
-Other extensions can extend this popup menu by pushing a code reference onto
+Other extensions can extend this popup menu by pushing a code reference
-C<@urxvt::ext::selection_popup::hook>, that is called whenever the popup is displayed.
+onto C<@{ $term->{selection_popup_hook} }>, that is called whenever the
+popup is displayed.
 It's sole argument is the popup menu, which can be modified. The selection
 is in C<$_>, which can be used to decide wether to add something or not.
 It should either return nothing or a string and a code reference. The
 string will be used as button text and the code reference will be called
 The following will add an entry C<a to b> that transforms all C<a>s in
 the selection to C<b>s, but only if the selection currently contains any
 C<a>s:
-   push urxvt::ext::selection_popup::hook, sub {
+   push @{ $self->{term}{selection_popup_hook} }, sub {
       /a/ ? ("a to be" => sub { s/a/b/g }
           : ()
    };
-Don't run it in a hook, otherwise the menu will grow and grow. Instead put
-it at the toplevel of your extension.
 =item searchable-scrollback<hotkey> (enabled by default)
 Adds regex search functionality to the scrollback buffer, triggered
 by a hotkey (default: C<M-s>). While in search mode, normal terminal
 called whenever the relevant event happens.
 The first argument passed to them is an extension oject as described in
 the in the C<Extension Objects> section.
-B<All> of these hooks must return a boolean value. If it is true, then the
+B<All> of these hooks must return a boolean value. If any of the called
-event counts as being I<consumed>, and the invocation of other hooks is
+hooks returns true, then the event counts as being I<consumed>, and the
-skipped, and the relevant action might not be carried out by the C++ code.
+relevant action might not be carried out by the C++ code.
 I<< When in doubt, return a false value (preferably C<()>). >>
 =over 4
 =item on_init $term
 Called after a new terminal object has been initialized, but before
 windows are created or the command gets run. Most methods are unsafe to
 call or deliver senseless data, as terminal size and other characteristics
-have not yet been determined. You can safely query and change resources,
+have not yet been determined. You can safely query and change resources
-though.
+and options, though. For many purposes the C<on_start> hook is a better
+place.
+=item on_start $term
+Called at the very end of initialisation of a new terminal, just before
+trying to map (display) the toplevel and returning to the mainloop.
+=item on_destroy $term
+Called whenever something tries to destroy terminal, before doing anything
+yet. If this hook returns true, then destruction is skipped, but this is
+rarely a good idea.
 =item on_reset $term
 Called after the screen is "reset" for any reason, such as resizing or
 control sequences. Here is where you can react on changes to size-related
 variables.
-=item on_start $term
-Called at the very end of initialisation of a new terminal, just before
-returning to the mainloop.
 =item on_child_start $term, $pid
 Called just after the child process has been C<fork>ed.
 use Scalar::Util ();
 use List::Util ();
 our $VERSION = 1;
 our $TERM;
+our @TERM_INIT;
+our @TERM_EXT;
 our @HOOKNAME;
 our %HOOKTYPE = map +($HOOKNAME[$_] => $_), 0..$#HOOKNAME;
 our %OPTION;
 our $LIBDIR;
 =item $urxvt::TERM
 The current terminal. This variable stores the current C<urxvt::term>
 object, whenever a callback/hook is executing.
+=item @urxvt::TERM_INIT
+All coderefs in this array will be called as methods of the next newly
+created C<urxvt::term> object (during the C<on_init> phase). The array
+gets cleared before the codereferences that were in it are being executed,
+so coderefs can push themselves onto it again if they so desire.
+This complements to the perl-eval commandline option, but gets executed
+first.
+=item @urxvt::TERM_EXT
+Works similar to C<@TERM_INIT>, but contains perl package/class names, which
+get registered as normal extensions after calling the hooks in C<@TERM_INIT>
+but before other extensions. Gets cleared just like C<@TERM_INIT>.
 =back
 =head2 Functions in the C<urxvt> Package
 # load a single script into its own package, once only
 sub extension_package($) {
    my ($path) = @_;
-   no strict 'refs';
    $extension_pkg{$path} ||= do {
       $path =~ /([^\/\\]+)$/;
       my $pkg = $1;
       $pkg =~ s/[^[:word:]]/_/g;
       $pkg = "urxvt::ext::$pkg";
       verbose 3, "loading extension '$path' into package '$pkg'";
       open my $fh, "<:raw", $path
          or die "$path: $!";
-      @{"$pkg\::ISA"} = urxvt::term::extension::;
       my $source =
          "package $pkg; use strict; use utf8;\n"
          . "#line 1 \"$path\"\n{\n"
          . (do { local $/; <$fh> })
          . "\n};\n1";
    if ($htype == 0) { # INIT
       my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl");
       my %ext_arg;
+      {
+         my @init = @TERM_INIT;
+         @TERM_INIT = ();
+         $_->($TERM) for @init;
+         my @pkg = @TERM_EXT;
+         @TERM_EXT = ();
+         $TERM->register_package ($_) for @pkg;
+      }
-      for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
+      for (grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
          if ($_ eq "default") {
             $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback);
          } elsif (/^-(.*)$/) {
             delete $ext_arg{$1};
          } elsif (/^([^<]+)<(.*)>$/) {
          if $verbosity >= 10;
       keys %$cb;
       while (my ($pkg, $cb) = each %$cb) {
-         $retval = eval { $cb->($TERM->{_pkg}{$pkg}, @_) }
+         my $retval_ = eval { $cb->($TERM->{_pkg}{$pkg}, @_) };
-            and last;
+         $retval ||= $retval_;
          if ($@) {
             $TERM->ungrab; # better to lose the grab than the session
             warn $@;
          }
 # find on_xxx subs in the package and register them
 # as hooks
 sub register_package {
    my ($self, $pkg, $argv) = @_;
+   no strict 'refs';
+   urxvt::verbose 6, "register package $pkg to $self";
+   @{"$pkg\::ISA"} = urxvt::term::extension::;
    my $proxy = bless {
       _pkg => $pkg,
       argv => $argv,
    }, $pkg;
    $self->{term}->ungrab;
 }
 =back
+=cut
+package urxvt::watcher;
+@urxvt::timer::ISA = __PACKAGE__;
+@urxvt::iow::ISA   = __PACKAGE__;
+@urxvt::pw::ISA    = __PACKAGE__;
+@urxvt::iw::ISA    = __PACKAGE__;
 =head2 The C<urxvt::timer> Class
 This class implements timer watchers/events. Time is represented as a
 fractional number of seconds since the epoch. Example:

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/urxvt.pm (file contents): Revision 1.109 by root, Thu Jan 19 16:07:09 2006 UTC vs. Revision 1.113 by root, Fri Jan 20 10:27:08 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.109 by root, Thu Jan 19 16:07:09 2006 UTC vs.
Revision 1.113 by root, Fri Jan 20 10:27:08 2006 UTC