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

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.193 by sf-exg, Wed Jun 29 15:30:28 2011 UTC vs.
Revision 1.208 by root, Tue Jun 5 22:23:07 2012 UTC

 The default pattern to match URLs can be overridden with the
 C<matcher.pattern.0> resource, and additional patterns can be specified
 with numbered patterns, in a manner similar to the "selection" extension.
 The launcher can also be overridden on a per-pattern basis.
-It is possible to activate the most recently seen match from the keyboard.
+It is possible to activate the most recently seen match or a list of matches
+from the keyboard.  Simply bind a keysym to "perl:matcher:last" or
-Simply bind a keysym to "perl:matcher" as seen in the example below.
+"perl:matcher:list" as seen in the example below.
 Example configuration:
     URxvt.perl-ext:           default,matcher
     URxvt.urlLauncher:        sensible-browser
-    URxvt.keysym.C-Delete:    perl:matcher
+    URxvt.keysym.C-Delete:    perl:matcher:last
+    URxvt.keysym.M-Delete:    perl:matcher:list
     URxvt.matcher.button:     1
     URxvt.matcher.pattern.1:  \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-]
     URxvt.matcher.pattern.2:  \\B(/\\S+?):(\\d+)(?=:|$)
     URxvt.matcher.launcher.2: gvim +$2 $1
 =item confirm-paste
 Displays a confirmation dialog when a paste containing at least a full
 line is detected.
+=item bell-command
+Runs the command specified by the C<URxvt.bell-command> resource when
+a bell event occurs. For example, the following pops up a notification
+bubble with the text "Beep, Beep" using notify-send:
+   URxvt.bell-command: notify-send "Beep, Beep"
 =back
 =head1 API DOCUMENTATION
 =head2 General API Considerations
 =item $octets
 Either binary data or - more common - a text string encoded in a
 locale-specific way.
+=item $keysym
+an integer that is a valid X11 keysym code. You can convert a string
+into a keysym and viceversa by using C<XStringToKeysym> and
+C<XKeysymToString>.
 =back
 =head2 Extension Objects
 a C<perl:string> action bound to a key, see description of the B<keysym>
 resource in the @@RXVT_NAME@@(1) manpage).
 The event is simply the action string. This interface is assumed to change
 slightly in the future.
+=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
    };
 }
 no warnings 'utf8';
+sub resource {
+   my ($term, $name, $isarg, $flag, $value) = @_;
+   $term->scan_meta;
+   warn "resourece<@_>\n";#d#
+   0
+}
+sub usage {
+   my ($term, $usage_type) = @_;
+   $term->scan_meta;
+   my $r = $term->{meta}{resource};
+   for my $regex (sort keys %$r) {
+      my ($ext, $type, $desc) = @{ $r->{$regex} };
+      $desc .= " (-pe $ext)";
+      if ($usage_type == 1) {
+         if ($type eq "boolean") {
+            urxvt::log sprintf "  -%-20.20s %s\n", "/+$regex", $desc;
+         } else {
+            urxvt::log sprintf "  -%-20.20s %s\n", "$regex $type", $desc;
+         }
+      } else {
+         urxvt::log sprintf "  %-19.19s %s\n", "$regex:", $type;
+      }
+   }
+}
 my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
 sub verbose {
    my ($level, $msg) = @_;
    warn "$msg\n" if $level <= $verbosity;
 sub invoke {
    local $TERM = shift;
    my $htype = shift;
    if ($htype == 0) { # INIT
-      my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl");
+      my @dirs = $TERM->perl_libdirs;
       my %ext_arg;
       {
          my @init = @TERM_INIT;
 sub DESTROY {
    $_[0][1]->stop;
 }
+# only needed for AnyEvent < 6 compatibility
 sub one_event {
    Carp::croak "AnyEvent->one_event blocking wait unsupported in urxvt, use a non-blocking API";
 }
 package urxvt::term;
          $proxy->enable ($name => $ref);
       }
    }
 }
+sub perl_libdirs {
+   map { split /:/ }
+      $_[0]->resource ("perl_lib"),
+      $ENV{URXVT_PERL_LIB},
+      "$ENV{HOME}/.urxvt/ext",
+      "$LIBDIR/perl"
+}
+sub scan_meta {
+   my ($self) = @_;
+   my @libdirs = perl_libdirs $self;
+   return if $self->{meta_libdirs} eq join "\x00", @libdirs;
+   my %meta;
+   $self->{meta_libdirs} = join "\x00", @libdirs;
+   $self->{meta}         = \%meta;
+   for my $dir (reverse @libdirs) {
+      opendir my $fh, $dir
+         or next;
+      for my $ext (readdir $fh) {
+         $ext ne "."
+            and $ext ne ".."
+            and open my $fh, "<", "$dir/$ext"
+            or next;
+         while (<$fh>) {
+            if (/^#:META:RESOURCE:(.*)/) {
+               my ($regex, $type, $desc) = split /:/, $1;
+               $regex =~ s/\$\$/$ext/g; # $$ in regex == extension name
+               $meta{resource}{$regex} = [$ext, $type, $desc];
+            } elsif (/^\s*(?:#|$)/) {
+               # skip other comments and empty lines
+            } else {
+               last; # stop parsing on first non-empty non-comment line
+            }
+         }
+      }
+   }
+}
 =item $term = new urxvt::term $envhashref, $rxvtname, [arg...]
 Creates a new terminal, very similar as if you had started it with system
 C<$rxvtname, arg...>. C<$envhashref> must be a reference to a C<%ENV>-like
 hash which defines the environment of the new terminal.
 C<%urxvt::OPTION>. Options not enabled in this binary are not in the hash.
 Here is a likely non-exhaustive list of option names, please see the
 source file F</src/optinc.h> to see the actual list:
- borderLess console cursorBlink cursorUnderline hold iconic insecure
+ borderLess buffered console cursorBlink cursorUnderline hold iconic
- intensityStyles jumpScroll loginShell mapAlert meta8 mouseWheelScrollPage
+ insecure intensityStyles iso14755 iso14755_52 jumpScroll loginShell
- override-redirect pastableTabs pointerBlank reverseVideo scrollBar
+ mapAlert meta8 mouseWheelScrollPage override_redirect pastableTabs
- scrollBar_floating scrollBar_right scrollTtyKeypress scrollTtyOutput
+ pointerBlank reverseVideo scrollBar scrollBar_floating scrollBar_right
- scrollWithBuffer secondaryScreen secondaryScroll skipBuiltinGlyphs
+ scrollTtyKeypress scrollTtyOutput scrollWithBuffer secondaryScreen
- transparent tripleclickwords utmpInhibit visualBell
+ secondaryScroll skipBuiltinGlyphs skipScroll transparent tripleclickwords
+ urgentOnBell utmpInhibit visualBell
 =item $value = $term->resource ($name[, $newval])
 Returns the current resource value associated with a given name and
 optionally sets a new value. Setting values is most useful in the C<init>
 Here is a likely non-exhaustive list of resource names, not all of which
 are supported in every build, please see the source file F</src/rsinc.h>
 to see the actual list:
-  answerbackstring backgroundPixmap backspace_key boldFont boldItalicFont
+  answerbackstring backgroundPixmap backspace_key blendtype blurradius
-  borderLess chdir color cursorBlink cursorUnderline cutchars delete_key
+  boldFont boldItalicFont borderLess buffered chdir color cursorBlink
-  display_name embed ext_bwidth fade font geometry hold iconName
+  cursorUnderline cutchars delete_key depth display_name embed ext_bwidth
-  imFont imLocale inputMethod insecure int_bwidth intensityStyles
+  fade font geometry hold iconName iconfile imFont imLocale inputMethod
-  italicFont jumpScroll lineSpace letterSpace loginShell mapAlert meta8
+  insecure int_bwidth intensityStyles iso14755 iso14755_52 italicFont
+  jumpScroll letterSpace lineSpace loginShell mapAlert meta8 modifier
-  modifier mouseWheelScrollPage name override_redirect pastableTabs path
+  mouseWheelScrollPage name override_redirect pastableTabs path perl_eval
-  perl_eval perl_ext_1 perl_ext_2 perl_lib pointerBlank pointerBlankDelay
+  perl_ext_1 perl_ext_2 perl_lib pointerBlank pointerBlankDelay
   preeditType print_pipe pty_fd reverseVideo saveLines scrollBar
   scrollBar_align scrollBar_floating scrollBar_right scrollBar_thickness
   scrollTtyKeypress scrollTtyOutput scrollWithBuffer scrollstyle
-  secondaryScreen secondaryScroll shade term_name title
+  secondaryScreen secondaryScroll shade skipBuiltinGlyphs skipScroll
-  transient_for transparent transparent_all tripleclickwords utmpInhibit
+  term_name title transient_for transparent tripleclickwords urgentOnBell
-  visualBell
+  utmpInhibit visualBell
 =cut
 sub resource($$;$) {
    my ($self, $name) = (shift, shift);
 This method should only be called during the C<on_start> hook, as there is
 only one resource database per display, and later invocations might return
 the wrong resources.
-=item $success = $term->parse_keysym ($keysym_spec, $command_string)
+=item $success = $term->parse_keysym ($key, $octets)
-Adds a keymap translation exactly as specified via a resource. See the
+Adds a key binding exactly as specified via a resource. See the
 C<keysym> resource in the @@RXVT_NAME@@(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.
 Adds the specified events to the vt event mask. Useful e.g. when you want
 to receive pointer events all the times:
    $term->vt_emask_add (urxvt::PointerMotionMask);
+=item $term->set_urgency ($set)
+Enable/disable the urgency hint on the toplevel window.
 =item $term->focus_in
 =item $term->focus_out
 =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])
+=item $keysym = $term->XStringToKeysym ($string)
+=item $string = $term->XKeysymToString ($keysym)
 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
 directly onto the X functions of the same name.

Diff Legend

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

Comparing rxvt-unicode/src/urxvt.pm (file contents): Revision 1.193 by sf-exg, Wed Jun 29 15:30:28 2011 UTC vs. Revision 1.208 by root, Tue Jun 5 22:23:07 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.193 by sf-exg, Wed Jun 29 15:30:28 2011 UTC vs.
Revision 1.208 by root, Tue Jun 5 22:23:07 2012 UTC