ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/urxvt.pm
(Generate patch)

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.209 by root, Tue Jun 5 22:38:17 2012 UTC vs.
Revision 1.213 by root, Wed Jun 6 15:09:49 2012 UTC

… …
762use Scalar::Util (); 762use Scalar::Util ();
763use List::Util (); 763use List::Util ();
764 764
765our $VERSION = 1; 765our $VERSION = 1;
766our $TERM; 766our $TERM;
767our @TERM_INIT; 767our @TERM_INIT; # should go, prevents async I/O etc.
768our @TERM_EXT; 768our @TERM_EXT; # should go, prevents async I/O etc.
769our @HOOKNAME; 769our @HOOKNAME;
770our %HOOKTYPE = map +($HOOKNAME[$_] => $_), 0..$#HOOKNAME; 770our %HOOKTYPE = map +($HOOKNAME[$_] => $_), 0..$#HOOKNAME;
771our %OPTION; 771our %OPTION;
772 772
773our $LIBDIR; 773our $LIBDIR;
… …
943 }; 943 };
944} 944}
945 945
946no warnings 'utf8'; 946no warnings 'utf8';
947 947
948sub resource { 948sub parse_resource {
949 my ($term, $name, $isarg, $flag, $value) = @_; 949 my ($term, $name, $isarg, $longopt, $flag, $value) = @_;
950 950
951 $term->scan_meta; 951 $term->scan_meta;
952 952
953 warn "resourece<@_>\n";#d# 953 my $r = $term->{meta}{resource};
954 while (my ($pattern, $v) = each %$r) {
955 $name =~ y/-/./ if $isarg;
956
957 if (
958 $pattern =~ /\.$/
959 ? $pattern eq substr $name, 0, length $pattern
960 : $pattern eq $name
961 ) {
962 $name = "$urxvt::RESCLASS.$name";
963
964 push @TERM_EXT, $v->[0];
965
966 if ($v->[1] eq "boolean") {
967 $term->put_option_db ($name, $flag ? "true" : "false");
968 return 1;
969 } else {
970 $term->put_option_db ($name, $value);
971 return 1 + 2;
972 }
973 }
974 }
954 975
955 0 976 0
956} 977}
957 978
958sub usage { 979sub usage {
… …
960 981
961 $term->scan_meta; 982 $term->scan_meta;
962 983
963 my $r = $term->{meta}{resource}; 984 my $r = $term->{meta}{resource};
964 985
965 for my $regex (sort keys %$r) { 986 for my $pattern (sort keys %$r) {
966 my ($ext, $type, $desc) = @{ $r->{$regex} }; 987 my ($ext, $type, $desc) = @{ $r->{$pattern} };
967 988
968 $desc .= " (-pe $ext)"; 989 $desc .= " (-pe $ext)";
969 990
970 if ($usage_type == 1) { 991 if ($usage_type == 1) {
992 $pattern =~ y/./-/;
993 $pattern =~ s/-$/-.../g;
994
971 if ($type eq "boolean") { 995 if ($type eq "boolean") {
972 urxvt::log sprintf " -%-20.20s %s\n", "/+$regex", $desc; 996 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc;
973 } else { 997 } else {
974 urxvt::log sprintf " -%-20.20s %s\n", "$regex $type", $desc; 998 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc;
975 } 999 }
976 } else { 1000 } else {
1001 $pattern =~ s/\.$/.*/g;
977 urxvt::log sprintf " %-19.19s %s\n", "$regex:", $type; 1002 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type;
978 } 1003 }
979 } 1004 }
980} 1005}
981 1006
982my $verbosity = $ENV{URXVT_PERL_VERBOSITY}; 1007my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
… …
1333 and $ext ne ".." 1358 and $ext ne ".."
1334 and open my $fh, "<", "$dir/$ext" 1359 and open my $fh, "<", "$dir/$ext"
1335 or next; 1360 or next;
1336 1361
1337 while (<$fh>) { 1362 while (<$fh>) {
1338 if (/^#:META:RESOURCE:(.*)/) { 1363 if (/^#:META:X_RESOURCE:(.*)/) {
1339 my ($regex, $type, $desc) = split /:/, $1; 1364 my ($pattern, $type, $desc) = split /:/, $1;
1340 $regex =~ s/\$\$/$ext/g; # $$ in regex == extension name 1365 $pattern =~ s/^%(?:\.|$)/$ext./g; # % in pattern == extension name
1366 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
1367 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1368 } else {
1341 $meta{resource}{$regex} = [$ext, $type, $desc]; 1369 $meta{resource}{$pattern} = [$ext, $type, $desc];
1370 }
1342 } elsif (/^\s*(?:#|$)/) { 1371 } elsif (/^\s*(?:#|$)/) {
1343 # skip other comments and empty lines 1372 # skip other comments and empty lines
1344 } else { 1373 } else {
1345 last; # stop parsing on first non-empty non-comment line 1374 last; # stop parsing on first non-empty non-comment line
1346 } 1375 }
… …
1473 1502
1474This method should only be called during the C<on_start> hook, as there is 1503This method should only be called during the C<on_start> hook, as there is
1475only one resource database per display, and later invocations might return 1504only one resource database per display, and later invocations might return
1476the wrong resources. 1505the wrong resources.
1477 1506
1507=item $value = $term->x_resource_boolean ($pattern)
1508
1509Like C<x_resource>, above, but interprets the string value as a boolean
1510and returns C<1> for true values, C<0> for false values and C<undef> if
1511the resource or option isn't specified.
1512
1513You should always use this method to parse boolean resources.
1514
1515=cut
1516
1517sub x_resource_boolean {
1518 my $res = &x_resource;
1519
1520 $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0
1521}
1522
1478=item $success = $term->parse_keysym ($key, $octets) 1523=item $success = $term->parse_keysym ($key, $octets)
1479 1524
1480Adds a key binding exactly as specified via a resource. See the 1525Adds a key binding exactly as specified via a resource. See the
1481C<keysym> resource in the @@RXVT_NAME@@(1) manpage. 1526C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
1482 1527

Diff Legend

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