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

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.211 by root, Wed Jun 6 14:34:03 2012 UTC vs.
Revision 1.217 by root, Sun Jun 10 13:58:05 2012 UTC

 =head1 DESCRIPTION
 Every time a terminal object gets created, extension scripts specified via
 the C<perl> resource are loaded and associated with it.
-Scripts are compiled in a 'use strict' and 'use utf8' environment, and
+Scripts are compiled in a 'use strict "vars"' and 'use utf8' environment, and
 thus must be encoded as UTF-8.
 Each script will only ever be loaded once, even in @@RXVT_NAME@@d, where
 scripts will be shared (but not enabled) for all terminals.
 =cut
 package urxvt;
 use utf8;
-use strict;
+use strict 'vars';
 use Carp ();
 use Scalar::Util ();
 use List::Util ();
 our $VERSION = 1;
 no warnings 'utf8';
 sub parse_resource {
    my ($term, $name, $isarg, $longopt, $flag, $value) = @_;
+   $name =~ y/-/./ if $isarg;
    $term->scan_meta;
    my $r = $term->{meta}{resource};
+   keys %$r; # reste iterator
    while (my ($pattern, $v) = each %$r) {
-      $name =~ y/-/./ if $isarg;
       if (
-         $pattern =~ s/\*$//
+         $pattern =~ /\.$/
          ? $pattern eq substr $name, 0, length $pattern
          : $pattern eq $name
       ) {
          $name = "$urxvt::RESCLASS.$name";
-         push @TERM_EXT, $v->[0];
+         push @{ $term->{perl_ext_3} }, $v->[0];
          if ($v->[1] eq "boolean") {
             $term->put_option_db ($name, $flag ? "true" : "false");
             return 1;
          } else {
       $desc .= " (-pe $ext)";
       if ($usage_type == 1) {
          $pattern =~ y/./-/;
-         $pattern =~ s/\*/.../g;
+         $pattern =~ s/-$/-.../g;
          if ($type eq "boolean") {
             urxvt::log sprintf "  -%-30s %s\n", "/+$pattern", $desc;
          } else {
             urxvt::log sprintf "  -%-30s %s\n", "$pattern $type", $desc;
          }
       } else {
+         $pattern =~ s/\.$/.*/g;
          urxvt::log sprintf "  %-31s %s\n", "$pattern:", $type;
       }
    }
 }
       $pkg =~ s/[^[:word:]]/_/g;
       $pkg = "urxvt::ext::$pkg";
       verbose 3, "loading extension '$path' into package '$pkg'";
+      (${"$pkg\::_NAME"} = $path) =~ s/^.*[\\\/]//; # hackish
       open my $fh, "<:raw", $path
          or die "$path: $!";
       my $source =
-         "package $pkg; use strict; use utf8; no warnings 'utf8';\n"
+         "package $pkg; use strict 'vars'; use utf8; no warnings 'utf8';\n"
          . "#line 1 \"$path\"\n{\n"
          . (do { local $/; <$fh> })
          . "\n};\n1";
       eval $source
          my @pkg = @TERM_EXT;
          @TERM_EXT = ();
          $TERM->register_package ($_) for @pkg;
       }
+      for (
+         @{ delete $TERM->{perl_ext_3} },
-      for (grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
+         grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2
+      ) {
          if ($_ eq "default") {
             $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback readline);
          } elsif (/^-(.*)$/) {
             delete $ext_arg{$1};
          } elsif (/^([^<]+)<(.*)>$/) {
       }
    }
    ($mask, @color{qw(fg bg)}, \@failed)
 }
-# urxvt::term::extension
 package urxvt::term::extension;
 sub enable {
    my ($self, %hook) = @_;
    my $pkg = $self->{_pkg};
    ${$_[0]}->();
 }
 sub urxvt::destroy_hook(&) {
    bless \shift, urxvt::destroy_hook::
+}
+sub x_resource {
+   my ($self, $name) = @_;
+   $name =~ s/^%(\.|$)/$_[0]{_name}$1/;
+   $self->{term}->x_resource ($name)
+}
+sub x_resource_boolean {
+   my ($self, $name) = @_;
+   $name =~ s/^%(\.|$)/$_[0]{_name}$1/;
+   $self->{term}->x_resource_boolean ($name)
 }
 package urxvt::anyevent;
 =head2 The C<urxvt::anyevent> Class
    urxvt::verbose 6, "register package $pkg to $self";
    @{"$pkg\::ISA"} = urxvt::term::extension::;
    my $proxy = bless {
-      _pkg => $pkg,
+      _pkg  => $pkg,
+      _name => ${"$pkg\::_NAME"}, # hackish
-      argv => $argv,
+      argv  => $argv,
    }, $pkg;
    Scalar::Util::weaken ($proxy->{term} = $self);
    $self->{_pkg}{$pkg} = $proxy;
             or next;
          while (<$fh>) {
             if (/^#:META:X_RESOURCE:(.*)/) {
                my ($pattern, $type, $desc) = split /:/, $1;
-               $pattern =~ s/^%\./$ext./g; # $$ in pattern == extension name
+               $pattern =~ s/^%(\.|$)/$ext$1/g; # % in pattern == extension name
-               if ($pattern =~ /[^a-zA-Z\*\.]/) {
+               if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
                   warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
                } else {
                   $meta{resource}{$pattern} = [$ext, $type, $desc];
                }
             } elsif (/^\s*(?:#|$)/) {
 Returns the X-Resource for the given pattern, excluding the program or
 class name, i.e.  C<< $term->x_resource ("boldFont") >> should return the
 same value as used by this instance of rxvt-unicode. Returns C<undef> if no
 resource with that pattern exists.
+Extensions that define extra resource or command line arguments also need
+to call this method to access their values.
+If the method is called on an extension object (basically, from an
+extension), then the special prefix C<%.> will be replaced by the name of
+the extension and a dot, and the lone string C<%> will be replcaed by the
+extension name itself. This makes it possible to code extensions so you
+can rename them and get a new set of commandline switches and resources
+without having to change the actual code.
 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 $value = $term->x_resource_boolean ($pattern)

Diff Legend

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

Comparing rxvt-unicode/src/urxvt.pm (file contents): Revision 1.211 by root, Wed Jun 6 14:34:03 2012 UTC vs. Revision 1.217 by root, Sun Jun 10 13:58:05 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.211 by root, Wed Jun 6 14:34:03 2012 UTC vs.
Revision 1.217 by root, Sun Jun 10 13:58:05 2012 UTC