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

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.226 by root, Sat Sep 22 14:35:55 2012 UTC vs.
Revision 1.233 by sf-exg, Fri May 2 20:34:24 2014 UTC

 =item on_refresh_end $term
 Called just after the screen gets redrawn. See C<on_refresh_begin>.
-=item on_user_command $term, $string
+=item on_user_command $term, $string *DEPRECATED*
 Called whenever a user-configured event is being activated (e.g. via
 a C<perl:string> action bound to a key, see description of the B<keysym>
 resource in the urxvt(1) manpage).
-The event is simply the action string. This interface is assumed to change
+The event is simply the action string. This interface is going away in
-slightly in the future.
+preference to the C<< ->register_keysym_action >> method.
-=item on_register_command $term, $keysym, $modifiermask, $string
-Called after parsing a keysym resource but before registering the
-associated binding. If this hook returns TRUE the binding is not
-registered. It can be used to modify a binding by calling
-C<register_command>.
 =item on_resize_all_windows $term, $new_width, $new_height
 Called just after the new window size has been calculated, but before
 windows are actually being resized or hints are being set. If this hook
-returns TRUE, setting of the window hints is being skipped.
+returns a true value, setting of the window hints is being skipped.
 =item on_x_event $term, $event
 Called on every X event received on the vt window (and possibly other
 windows). Should only be used as a last resort. Most event structure
 manpage), with the additional members C<row> and C<col>, which are the
 (real, not screen-based) row and column under the mouse cursor.
 C<on_key_press> additionally receives the string rxvt-unicode would
 output, if any, in locale-specific encoding.
-subwindow.
 =item on_client_message $term, $event
 =item on_wm_protocols $term, $event
    $name =~ y/-/./ if $isarg;
    $term->scan_meta;
    my $r = $term->{meta}{resource};
-   keys %$r; # reste iterator
+   keys %$r; # reset iterator
    while (my ($pattern, $v) = each %$r) {
       if (
          $pattern =~ /\.$/
          ? $pattern eq substr $name, 0, length $pattern
          : $pattern eq $name
 # called by the rxvt core
 sub invoke {
    local $TERM = shift;
    my $htype = shift;
-   if ($htype == 0) { # INIT
+   if ($htype == HOOK_INIT) {
       my @dirs = $TERM->perl_libdirs;
       my %ext_arg;
       {
    if (my $cb = $TERM->{_hook}[$htype]) {
       verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")"
          if $verbosity >= 10;
-      for my $pkg (keys %$cb) {
+      for my $pkg (
+         # this hook is only sent to the extension with the name
+         # matching the first arg
+         $htype == HOOK_KEYBOARD_DISPATCH
+         ? exists $cb->{"urxvt::ext::$_[0]"} ? "urxvt::ext::" . shift : return undef
+         : keys %$cb
+      ) {
          my $retval_ = eval { $cb->{$pkg}->($TERM->{_pkg}{$pkg} || $TERM, @_) };
          $retval ||= $retval_;
          if ($@) {
             $TERM->ungrab; # better to lose the grab than the session
       verbose 11, "$HOOKNAME[$htype] returning <$retval>"
          if $verbosity >= 11;
    }
-   if ($htype == 1) { # DESTROY
+   if ($htype == HOOK_DESTROY) {
       # clear package objects
       %$_ = () for values %{ $TERM->{_pkg} };
       # clear package
       %$TERM = ();
 }
 =item $self->enable ($hook_name => $cb[, $hook_name => $cb..])
 Dynamically enable the given hooks (named without the C<on_> prefix) for
-this extension, replacing any previous hook. This is useful when you want
+this extension, replacing any hook previously installed via C<enable> in
-to overwrite time-critical hooks only temporarily.
+this extension.
+This is useful when you want to overwrite time-critical hooks only
+temporarily.
 To install additional callbacks for the same hook, you can use the C<on>
 method of the C<urxvt::term> class.
 =item $self->disable ($hook_name[, $hook_name..])
    my $res = &x_resource;
    $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0
 }
-=item $success = $term->parse_keysym ($key, $octets)
+=item $success = $term->bind_action ($key, $octets)
 Adds a key binding exactly as specified via a resource. See the
 C<keysym> resource in the urxvt(1) manpage.
-=item $term->register_command ($keysym, $modifiermask, $string)
-Adds a key binding. This is a lower level api compared to
-C<parse_keysym>, as it expects a parsed key description, and can be
-used only inside either the C<on_init> hook, to add a binding, or the
-C<on_register_command> hook, to modify a parsed binding.
 =item $rend = $term->rstyle ([$new_rstyle])
 Return and optionally change the current rendition. Text that is output by
 the terminal application will use this style.
 }
 sub urxvt::line::t {
    my ($self) = @_;
-   if (@_ > 1)
+   if (@_ > 1) {
-     {
-       $self->{term}->ROW_t ($_, $_[1], 0, ($_ - $self->{beg}) * $self->{ncol}, $self->{ncol})
+      $self->{term}->ROW_t ($_, $_[1], 0, ($_ - $self->{beg}) * $self->{ncol}, $self->{ncol})
-          for $self->{beg} .. $self->{end};
+         for $self->{beg} .. $self->{end};
-     }
+   }
    defined wantarray &&
       substr +(join "", map $self->{term}->ROW_t ($_), $self->{beg} .. $self->{end}),
              0, $self->{len}
 }
 sub urxvt::line::r {
    my ($self) = @_;
-   if (@_ > 1)
+   if (@_ > 1) {
-     {
-       $self->{term}->ROW_r ($_, $_[1], 0, ($_ - $self->{beg}) * $self->{ncol}, $self->{ncol})
+      $self->{term}->ROW_r ($_, $_[1], 0, ($_ - $self->{beg}) * $self->{ncol}, $self->{ncol})
-          for $self->{beg} .. $self->{end};
+         for $self->{beg} .. $self->{end};
-     }
+   }
    if (defined wantarray) {
       my $rend = [
          map @{ $self->{term}->ROW_r ($_) }, $self->{beg} .. $self->{end}
       ];

Diff Legend

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

Comparing rxvt-unicode/src/urxvt.pm (file contents): Revision 1.226 by root, Sat Sep 22 14:35:55 2012 UTC vs. Revision 1.233 by sf-exg, Fri May 2 20:34:24 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.226 by root, Sat Sep 22 14:35:55 2012 UTC vs.
Revision 1.233 by sf-exg, Fri May 2 20:34:24 2014 UTC