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.210 by root, Wed Jun 6 11:46:11 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;
948sub parse_resource { 948sub parse_resource {
949 my ($term, $name, $isarg, $longopt, $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#
954
955 my $r = $term->{meta}{resource}; 953 my $r = $term->{meta}{resource};
956 while (my ($pattern, $v) = each %$r) { 954 while (my ($pattern, $v) = each %$r) {
957 $name =~ y/-/./ if $isarg; 955 $name =~ y/-/./ if $isarg;
958 956
959 if ( 957 if (
960 $pattern =~ s/\*$// 958 $pattern =~ /\.$/
961 ? $pattern eq substr $name, 0, length $pattern 959 ? $pattern eq substr $name, 0, length $pattern
962 : $pattern eq $name 960 : $pattern eq $name
963 ) { 961 ) {
964 $name = "$urxvt::RESCLASS.$name"; 962 $name = "$urxvt::RESCLASS.$name";
965 warn "set option <$name=$value>\n";#d# 963
966 #TODO: queue $v->[0] for loading 964 push @TERM_EXT, $v->[0];
965
967 if ($v->[1] eq "boolean") { 966 if ($v->[1] eq "boolean") {
968 $term->put_option_db ($name, $flag ? "true" : "false"); 967 $term->put_option_db ($name, $flag ? "true" : "false");
969 return 1; 968 return 1;
970 } else { 969 } else {
971 $term->put_option_db ($name, $value); 970 $term->put_option_db ($name, $value);
989 988
990 $desc .= " (-pe $ext)"; 989 $desc .= " (-pe $ext)";
991 990
992 if ($usage_type == 1) { 991 if ($usage_type == 1) {
993 $pattern =~ y/./-/; 992 $pattern =~ y/./-/;
994 $pattern =~ s/\*/.../g; 993 $pattern =~ s/-$/-.../g;
995 994
996 if ($type eq "boolean") { 995 if ($type eq "boolean") {
997 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc; 996 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc;
998 } else { 997 } else {
999 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc; 998 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc;
1000 } 999 }
1001 } else { 1000 } else {
1001 $pattern =~ s/\.$/.*/g;
1002 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type; 1002 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type;
1003 } 1003 }
1004 } 1004 }
1005} 1005}
1006 1006
1360 or next; 1360 or next;
1361 1361
1362 while (<$fh>) { 1362 while (<$fh>) {
1363 if (/^#:META:X_RESOURCE:(.*)/) { 1363 if (/^#:META:X_RESOURCE:(.*)/) {
1364 my ($pattern, $type, $desc) = split /:/, $1; 1364 my ($pattern, $type, $desc) = split /:/, $1;
1365 $pattern =~ s/^%\./$ext./g; # $$ in pattern == extension name 1365 $pattern =~ s/^%(?:\.|$)/$ext./g; # % in pattern == extension name
1366 if ($pattern =~ /[^a-zA-Z\*\.]/) { 1366 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
1367 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n"; 1367 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1368 } else { 1368 } else {
1369 $meta{resource}{$pattern} = [$ext, $type, $desc]; 1369 $meta{resource}{$pattern} = [$ext, $type, $desc];
1370 } 1370 }
1371 } elsif (/^\s*(?:#|$)/) { 1371 } elsif (/^\s*(?:#|$)/) {
1502 1502
1503This 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
1504only one resource database per display, and later invocations might return 1504only one resource database per display, and later invocations might return
1505the wrong resources. 1505the wrong resources.
1506 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
1507=item $success = $term->parse_keysym ($key, $octets) 1523=item $success = $term->parse_keysym ($key, $octets)
1508 1524
1509Adds a key binding exactly as specified via a resource. See the 1525Adds a key binding exactly as specified via a resource. See the
1510C<keysym> resource in the @@RXVT_NAME@@(1) manpage. 1526C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
1511 1527

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines