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.216 by root, Sun Jun 10 13:32:55 2012 UTC

… …
20=head1 DESCRIPTION 20=head1 DESCRIPTION
21 21
22Every time a terminal object gets created, extension scripts specified via 22Every time a terminal object gets created, extension scripts specified via
23the C<perl> resource are loaded and associated with it. 23the C<perl> resource are loaded and associated with it.
24 24
25Scripts are compiled in a 'use strict' and 'use utf8' environment, and 25Scripts are compiled in a 'use strict "vars"' and 'use utf8' environment, and
26thus must be encoded as UTF-8. 26thus must be encoded as UTF-8.
27 27
28Each script will only ever be loaded once, even in @@RXVT_NAME@@d, where 28Each script will only ever be loaded once, even in @@RXVT_NAME@@d, where
29scripts will be shared (but not enabled) for all terminals. 29scripts will be shared (but not enabled) for all terminals.
30 30
… …
755=cut 755=cut
756 756
757package urxvt; 757package urxvt;
758 758
759use utf8; 759use utf8;
760use strict; 760use strict 'vars';
761use Carp (); 761use Carp ();
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;
… …
946no warnings 'utf8'; 946no warnings 'utf8';
947 947
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 $name =~ y/-/./ if $isarg;
952
951 $term->scan_meta; 953 $term->scan_meta;
952 954
953 warn "resourece<@_>\n";#d#
954
955 my $r = $term->{meta}{resource}; 955 my $r = $term->{meta}{resource};
956 keys %$r; # reste iterator
956 while (my ($pattern, $v) = each %$r) { 957 while (my ($pattern, $v) = each %$r) {
957 $name =~ y/-/./ if $isarg;
958
959 if ( 958 if (
960 $pattern =~ s/\*$// 959 $pattern =~ /\.$/
961 ? $pattern eq substr $name, 0, length $pattern 960 ? $pattern eq substr $name, 0, length $pattern
962 : $pattern eq $name 961 : $pattern eq $name
963 ) { 962 ) {
964 $name = "$urxvt::RESCLASS.$name"; 963 $name = "$urxvt::RESCLASS.$name";
965 warn "set option <$name=$value>\n";#d# 964
966 #TODO: queue $v->[0] for loading 965 push @{ $term->{perl_ext_3} }, $v->[0];
966
967 if ($v->[1] eq "boolean") { 967 if ($v->[1] eq "boolean") {
968 $term->put_option_db ($name, $flag ? "true" : "false"); 968 $term->put_option_db ($name, $flag ? "true" : "false");
969 return 1; 969 return 1;
970 } else { 970 } else {
971 $term->put_option_db ($name, $value); 971 $term->put_option_db ($name, $value);
… …
989 989
990 $desc .= " (-pe $ext)"; 990 $desc .= " (-pe $ext)";
991 991
992 if ($usage_type == 1) { 992 if ($usage_type == 1) {
993 $pattern =~ y/./-/; 993 $pattern =~ y/./-/;
994 $pattern =~ s/\*/.../g; 994 $pattern =~ s/-$/-.../g;
995 995
996 if ($type eq "boolean") { 996 if ($type eq "boolean") {
997 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc; 997 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc;
998 } else { 998 } else {
999 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc; 999 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc;
1000 } 1000 }
1001 } else { 1001 } else {
1002 $pattern =~ s/\.$/.*/g;
1002 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type; 1003 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type;
1003 } 1004 }
1004 } 1005 }
1005} 1006}
1006 1007
… …
1027 1028
1028 open my $fh, "<:raw", $path 1029 open my $fh, "<:raw", $path
1029 or die "$path: $!"; 1030 or die "$path: $!";
1030 1031
1031 my $source = 1032 my $source =
1032 "package $pkg; use strict; use utf8; no warnings 'utf8';\n" 1033 "package $pkg; use strict 'vars'; use utf8; no warnings 'utf8';\n"
1033 . "#line 1 \"$path\"\n{\n" 1034 . "#line 1 \"$path\"\n{\n"
1034 . (do { local $/; <$fh> }) 1035 . (do { local $/; <$fh> })
1035 . "\n};\n1"; 1036 . "\n};\n1";
1036 1037
1037 eval $source 1038 eval $source
… …
1060 my @pkg = @TERM_EXT; 1061 my @pkg = @TERM_EXT;
1061 @TERM_EXT = (); 1062 @TERM_EXT = ();
1062 $TERM->register_package ($_) for @pkg; 1063 $TERM->register_package ($_) for @pkg;
1063 } 1064 }
1064 1065
1066 for (
1067 @{ delete $TERM->{perl_ext_3} },
1065 for (grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) { 1068 grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2
1069 ) {
1066 if ($_ eq "default") { 1070 if ($_ eq "default") {
1067 $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback readline); 1071 $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback readline);
1068 } elsif (/^-(.*)$/) { 1072 } elsif (/^-(.*)$/) {
1069 delete $ext_arg{$1}; 1073 delete $ext_arg{$1};
1070 } elsif (/^([^<]+)<(.*)>$/) { 1074 } elsif (/^([^<]+)<(.*)>$/) {
… …
1360 or next; 1364 or next;
1361 1365
1362 while (<$fh>) { 1366 while (<$fh>) {
1363 if (/^#:META:X_RESOURCE:(.*)/) { 1367 if (/^#:META:X_RESOURCE:(.*)/) {
1364 my ($pattern, $type, $desc) = split /:/, $1; 1368 my ($pattern, $type, $desc) = split /:/, $1;
1365 $pattern =~ s/^%\./$ext./g; # $$ in pattern == extension name 1369 $pattern =~ s/^%(\.|$)/$ext$1/g; # % in pattern == extension name
1366 if ($pattern =~ /[^a-zA-Z\*\.]/) { 1370 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
1367 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n"; 1371 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1368 } else { 1372 } else {
1369 $meta{resource}{$pattern} = [$ext, $type, $desc]; 1373 $meta{resource}{$pattern} = [$ext, $type, $desc];
1370 } 1374 }
1371 } elsif (/^\s*(?:#|$)/) { 1375 } elsif (/^\s*(?:#|$)/) {
… …
1502 1506
1503This method should only be called during the C<on_start> hook, as there is 1507This 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 1508only one resource database per display, and later invocations might return
1505the wrong resources. 1509the wrong resources.
1506 1510
1511=item $value = $term->x_resource_boolean ($pattern)
1512
1513Like C<x_resource>, above, but interprets the string value as a boolean
1514and returns C<1> for true values, C<0> for false values and C<undef> if
1515the resource or option isn't specified.
1516
1517You should always use this method to parse boolean resources.
1518
1519=cut
1520
1521sub x_resource_boolean {
1522 my $res = &x_resource;
1523
1524 $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0
1525}
1526
1507=item $success = $term->parse_keysym ($key, $octets) 1527=item $success = $term->parse_keysym ($key, $octets)
1508 1528
1509Adds a key binding exactly as specified via a resource. See the 1529Adds a key binding exactly as specified via a resource. See the
1510C<keysym> resource in the @@RXVT_NAME@@(1) manpage. 1530C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
1511 1531

Diff Legend

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