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.212 by root, Wed Jun 6 15:06:41 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 {
977 urxvt::log sprintf " %-19.19s %s\n", "$regex:", $type; 1001 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type;
978 } 1002 }
979 } 1003 }
980} 1004}
981 1005
982my $verbosity = $ENV{URXVT_PERL_VERBOSITY}; 1006my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
… …
1333 and $ext ne ".." 1357 and $ext ne ".."
1334 and open my $fh, "<", "$dir/$ext" 1358 and open my $fh, "<", "$dir/$ext"
1335 or next; 1359 or next;
1336 1360
1337 while (<$fh>) { 1361 while (<$fh>) {
1338 if (/^#:META:RESOURCE:(.*)/) { 1362 if (/^#:META:X_RESOURCE:(.*)/) {
1339 my ($regex, $type, $desc) = split /:/, $1; 1363 my ($pattern, $type, $desc) = split /:/, $1;
1340 $regex =~ s/\$\$/$ext/g; # $$ in regex == extension name 1364 $pattern =~ s/^%(?:\.|$)/$ext./g; # % in pattern == extension name
1365 if ($pattern =~ /[^a-zA-Z\.]/) {
1366 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1367 } else {
1341 $meta{resource}{$regex} = [$ext, $type, $desc]; 1368 $meta{resource}{$pattern} = [$ext, $type, $desc];
1369 }
1342 } elsif (/^\s*(?:#|$)/) { 1370 } elsif (/^\s*(?:#|$)/) {
1343 # skip other comments and empty lines 1371 # skip other comments and empty lines
1344 } else { 1372 } else {
1345 last; # stop parsing on first non-empty non-comment line 1373 last; # stop parsing on first non-empty non-comment line
1346 } 1374 }
… …
1473 1501
1474This method should only be called during the C<on_start> hook, as there is 1502This 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 1503only one resource database per display, and later invocations might return
1476the wrong resources. 1504the wrong resources.
1477 1505
1506=item $value = $term->x_resource_boolean ($pattern)
1507
1508Like C<x_resource>, above, but interprets the string value as a boolean
1509and returns C<1> for true values, C<0> for false values and C<undef> if
1510the resource or option isn't specified.
1511
1512You should always use this method to parse boolean resources.
1513
1514=cut
1515
1516sub x_resource_boolean {
1517 my $res = &x_resource;
1518
1519 $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0
1520}
1521
1478=item $success = $term->parse_keysym ($key, $octets) 1522=item $success = $term->parse_keysym ($key, $octets)
1479 1523
1480Adds a key binding exactly as specified via a resource. See the 1524Adds a key binding exactly as specified via a resource. See the
1481C<keysym> resource in the @@RXVT_NAME@@(1) manpage. 1525C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
1482 1526

Diff Legend

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