[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.125 by root, Sun Jan 22 20:39:47 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)
 =item selection-popup (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.
+evaluation, 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
 bottom. C<Escape> leaves search mode and returns to the point where search
 was started, while C<Enter> or C<Return> stay at the current position and
 additionally stores the first match in the current line into the primary
 selection.
+=item readline (enabled by default)
+A support package that tries to make editing with readline easier. At the
+moment, it reacts to clicking with the left mouse button by trying to
+move the text cursor to this position. It does so by generating as many
+cursor-left or cursor-right keypresses as required (the this only works
+for programs that correctly support wide characters).
+To avoid too many false positives, this is only done when:
+=over 4
+=item - the tty is in ICANON state.
+=item - the text cursor is visible.
+=item - the primary screen is currently being displayed.
+=item - the mouse is on the same (multi-row-) line as the text cursor.
+=back
+The normal selection mechanism isn't disabled, so quick successive clicks
+might interfere with selection creation in harmless ways.
 =item selection-autotransform
 This selection allows you to do automatic transforms on a selection
 whenever a selection is made.
    URxvt.selection-autotransform.0: s/^ at (.*?) line (\\d+)[,.]$/:e \\Q$1\E\\x0d:$2\\x0d/
 The first line tells the selection code to treat the unchanging part of
 every error message as a selection pattern, and the second line transforms
 the message into vi commands to load the file.
+=item tabbed
+This transforms the terminal into a tabbar with additional terminals, that
+is, it implements what is commonly refered to as "tabbed terminal". The topmost line
+displays a "[NEW]" button, which, when clicked, will add a new tab, followed by one
+button per tab.
+Clicking a button will activate that tab. Pressing B<Shift-Left> and
+B<Shift-Right> will switch to the tab left or right of the current one,
+while B<Shift-Down> creates a new tab.
 =item mark-urls
 Uses per-line display filtering (C<on_line_update>) to underline urls and
 make them clickable. When middle-clicked, the program specified in the
 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.
 Called wheneever the window loses keyboard focus, before rxvt-unicode does
 focus out processing.
 =item on_configure_notify $term, $event
+=item on_property_notify $term, $event
 =item on_key_press $term, $event, $keysym, $octets
 =item on_key_release $term, $event, $keysym
 =item on_button_press $term, $event
 Called whenever the corresponding X event is received for the terminal If
 the hook returns true, then the even will be ignored by rxvt-unicode.
 The event is a hash with most values as named by Xlib (see the XEvent
-manpage), with the additional members C<row> and C<col>, which are the row
+manpage), with the additional members C<row> and C<col>, which are the
-and column under the mouse cursor.
+(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
+=item on_wm_delete_window $term, $event
+Called when various types of ClientMessage events are received (all with
+format=32, WM_PROTOCOLS or WM_PROTOCOLS:WM_DELETE_WINDOW).
 =back
 =cut
 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;
 our $RESNAME;
 our $RESCLASS;
 our $RXVTNAME;
+our $NOCHAR = chr 0xffff;
 =head2 Variables in the C<urxvt> Package
 =over 4
 =item $urxvt::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
          unless $msg =~ /\n$/;
       urxvt::warn ($msg);
    };
 }
+no warnings 'utf8';
 my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
 sub verbose {
    my ($level, $msg) = @_;
    warn "$msg\n" if $level <= $verbosity;
 my %extension_pkg;
 # 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;
       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"
+         "package $pkg; use strict; use utf8; no warnings 'utf8';\n"
          . "#line 1 \"$path\"\n{\n"
          . (do { local $/; <$fh> })
          . "\n};\n1";
       eval $source
    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);
+            $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback readline);
          } elsif (/^-(.*)$/) {
             delete $ext_arg{$1};
          } elsif (/^([^<]+)<(.*)>$/) {
             push @{ $ext_arg{$1} }, $2;
          } else {
          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;
 Normally its not a good idea to use this function, as programs might be
 confused by changes in cursor position or scrolling. Its useful inside a
 C<on_add_lines> hook, though.
+=item $term->scr_change_screen ($screen)
+Switch to given screen - 0 primary, 1 secondary.
 =item $term->cmd_parse ($octets)
 Similar to C<scr_add_lines>, but the argument must be in the
 locale-specific encoding of the terminal and can contain command sequences
 (escape codes) that will be interpreted.
 Replaces the event mask of the pty watcher by the given event mask. Can
 be used to suppress input and output handling to the pty/tty. See the
 description of C<< urxvt::timer->events >>. Make sure to always restore
 the previous value.
+=item $fd = $term->pty_fd
+Returns the master file descriptor for the pty in use, or C<-1> if no pty
+is used.
 =item $windowid = $term->parent
 Return the window id of the toplevel window.
 =item $modifiermask = $term->ModNumLockMask
 Return the modifier masks corresponding to the "ISO Level 3 Shift" (often
 AltGr), the meta key (often Alt) and the num lock key, if applicable.
+=item $screen = $term->current_screen
+Returns the currently displayed screen (0 primary, 1 secondary).
+=item $cursor_is_hidden = $term->hidden_cursor
+Returns wether the cursor is currently hidden or not.
 =item $view_start = $term->view_start ([$newvalue])
 Returns the row number of the topmost displayed line. Maximum value is
 C<0>, which displays the normal terminal contents. Lower values scroll
 this many lines into the scrollback buffer.
 line, starting at column C<$start_col> (default C<0>), which is useful
 to replace only parts of a line. The font index in the rendition will
 automatically be updated.
 C<$text> is in a special encoding: tabs and wide characters that use more
-than one cell when displayed are padded with urxvt::NOCHAR characters
+than one cell when displayed are padded with C<$urxvt::NOCHAR> (chr 65535)
-(C<chr 65535>). Characters with combining characters and other characters
+characters. Characters with combining characters and other characters that
-that do not fit into the normal tetx encoding will be replaced with
+do not fit into the normal tetx encoding will be replaced with characters
-characters in the private use area.
+in the private use area.
 You have to obey this encoding when changing text. The advantage is
 that C<substr> and similar functions work on screen cells and not on
 characters.
 =item $term->ungrab
 Calls XUngrab for the most recent grab. Is called automatically on
 evaluation errors, as it is better to lose the grab in the error case as
 the session.
+=item $atom = $term->XInternAtom ($atom_name[, $only_if_exists])
+=item $atom_name = $term->XGetAtomName ($atom)
+=item @atoms = $term->XListProperties ($window)
+=item ($type,$format,$octets) = $term->XGetWindowProperty ($window, $property)
+=item $term->XChangeWindowProperty ($window, $property, $type, $format, $octets)
+=item $term->XDeleteProperty ($window, $property)
+=item $window = $term->DefaultRootWindow
+=item $term->XReparentWindow ($window, $parent, [$x, $y])
+=item $term->XMapWindow ($window)
+=item $term->XUnmapWindow ($window)
+=item $term->XMoveResizeWindow ($window, $x, $y, $width, $height)
+=item ($x, $y, $child_window) = $term->XTranslateCoordinates ($src, $dst, $x, $y)
+=item $term->XChangeInput ($window, $add_events[, $del_events])
+Various X or X-related functions. The C<$term> object only serves as
+the source of the display, otherwise those functions map more-or-less
+directory onto the X functions of the same name.
 =back
 =cut
    delete $self->{term}{_destroy}{$self};
    $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:
 Stop watching for events on the given filehandle.
 =back
+=head2 The C<urxvt::iw> Class
+This class implements idle watchers, that get called automatically when
+the process is idle. They should return as fast as possible, after doing
+some useful work.
+=over 4
+=item $iw = new urxvt::iw
+Create a new idle watcher object in stopped state.
+=item $iw = $iw->cb (sub { my ($iw) = @_; ... })
+Set the callback to be called when the watcher triggers.
+=item $timer = $timer->start
+Start the watcher.
+=item $timer = $timer->stop
+Stop the watcher.
+=back
+=head2 The C<urxvt::pw> Class
+This class implements process watchers. They create an event whenever a
+process exits, after which they stop automatically.
+   my $pid = fork;
+   ...
+   $term->{pw} = urxvt::pw
+                    ->new
+                    ->start ($pid)
+                    ->cb (sub {
+                       my ($pw, $exit_status) = @_;
+                       ...
+                    });
+=over 4
+=item $pw = new urxvt::pw
+Create a new process watcher in stopped state.
+=item $pw = $pw->cb (sub { my ($pw, $exit_status) = @_; ... })
+Set the callback to be called when the timer triggers.
+=item $pw = $timer->start ($pid)
+Tells the wqtcher to start watching for process C<$pid>.
+=item $pw = $pw->stop
+Stop the watcher.
+=back
 =head1 ENVIRONMENT
 =head2 URXVT_PERL_VERBOSITY
 This variable controls the verbosity level of the perl extension. Higher

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.125 by root, Sun Jan 22 20:39:47 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.125 by root, Sun Jan 22 20:39:47 2006 UTC