--- rxvt-unicode/src/perl/matcher	2011/08/19 23:08:35	1.6
+++ rxvt-unicode/src/perl/matcher	2012/06/10 13:58:05	1.9
@@ -1,8 +1,14 @@
 #! perl
 
-# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.info>
+# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org>
 #          Bob Farrell <robertanthonyfarrell@gmail.com>
 
+#:META:X_RESOURCE:%.launcher:string:default launcher command
+#:META:X_RESOURCE:%.button:string:the button, yeah
+#:META:X_RESOURCE:%.pattern.:string:extra pattern to match
+#:META:X_RESOURCE:%.launcher.:string:custom launcher for pattern
+#:META:X_RESOURCE:%.rend.:string:custom rednition for pattern
+
 my $url =
    qr{
       (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)
@@ -124,8 +130,7 @@
 }
 
 sub my_resource {
-   my $self = shift;
-   $self->x_resource ("$self->{name}.$_[0]");
+   $_[0]->x_resource ("%.$_[1]")
 }
 
 # turn a rendition spec in the resource into a sub that implements it on $_
@@ -146,18 +151,14 @@
 sub on_start {
    my ($self) = @_;
 
-   ($self->{name} = __PACKAGE__) =~ s/.*:://;
-   $self->{name} =~ tr/_/-/;
-   $self->{launcher} = $self->my_resource("launcher") ||
-                      $self->x_resource("urlLauncher") ||
-                      "sensible-browser";
+   $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
 
    $self->{urls} = [];
    $self->{showing} = 0;
    $self->{button}  = 2;
    $self->{state}   = 0;
-   if($self->{argv}[0] || $self->my_resource("button")) {
-      my @mods = split('', $self->{argv}[0] || $self->my_resource("button"));
+   if($self->{argv}[0] || $self->my_resource ("button")) {
+      my @mods = split '', $self->{argv}[0] || $self->my_resource ("button");
       for my $mod (@mods) {
          if($mod =~ /^\d+$/) {
             $self->{button} = $mod;
@@ -168,19 +169,19 @@
          } elsif($mod eq "M") {
             $self->{state} |= $self->ModMetaMask;
          } elsif($mod ne "-" && $mod ne " ") {
-            warn("$mod is invalid in $self->{name}<$self->{argv}[0]>\n");
+            warn("$mod is invalid in $self->{_name}<$self->{argv}[0]>\n");
          }
       }
    }
 
    my @defaults = ($url);
    my @matchers;
-   for (my $idx = 0; defined (my $res = $self->my_resource("pattern.$idx") || $defaults[$idx]); $idx++) {
+   for (my $idx = 0; defined (my $res = $self->my_resource ("pattern.$idx") || $defaults[$idx]); $idx++) {
       $res = $self->locale_decode ($res);
       utf8::encode $res;
-      my $launcher = $self->my_resource("launcher.$idx");
-      $launcher =~ s/\$&|\$\{&\}/\${0}/g if ($launcher);
-      my $rend = $self->parse_rend($self->my_resource("rend.$idx"));
+      my $launcher = $self->my_resource ("launcher.$idx");
+      $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher;
+      my $rend = $self->parse_rend($self->my_resource ("rend.$idx"));
       unshift @matchers, [qr($res)x,$launcher,$rend];
    }
    $self->{matchers} = \@matchers;