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.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;
… …
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
951 $name =~ y/-/./ if $isarg;
950 952
951 $term->scan_meta; 953 $term->scan_meta;
952 954
953 warn "resourece<@_>\n";#d# 955 my $r = $term->{meta}{resource};
956 keys %$r; # reste iterator
957 while (my ($pattern, $v) = each %$r) {
958 if (
959 $pattern =~ /\.$/
960 ? $pattern eq substr $name, 0, length $pattern
961 : $pattern eq $name
962 ) {
963 $name = "$urxvt::RESCLASS.$name";
964
965 push @{ $term->{perl_ext_3} }, $v->[0];
966
967 if ($v->[1] eq "boolean") {
968 $term->put_option_db ($name, $flag ? "true" : "false");
969 return 1;
970 } else {
971 $term->put_option_db ($name, $value);
972 return 1 + 2;
973 }
974 }
975 }
954 976
955 0 977 0
956} 978}
957 979
958sub usage { 980sub usage {
… …
960 982
961 $term->scan_meta; 983 $term->scan_meta;
962 984
963 my $r = $term->{meta}{resource}; 985 my $r = $term->{meta}{resource};
964 986
965 for my $regex (sort keys %$r) { 987 for my $pattern (sort keys %$r) {
966 my ($ext, $type, $desc) = @{ $r->{$regex} }; 988 my ($ext, $type, $desc) = @{ $r->{$pattern} };
967 989
968 $desc .= " (-pe $ext)"; 990 $desc .= " (-pe $ext)";
969 991
970 if ($usage_type == 1) { 992 if ($usage_type == 1) {
993 $pattern =~ y/./-/;
994 $pattern =~ s/-$/-.../g;
995
971 if ($type eq "boolean") { 996 if ($type eq "boolean") {
972 urxvt::log sprintf " -%-20.20s %s\n", "/+$regex", $desc; 997 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc;
973 } else { 998 } else {
974 urxvt::log sprintf " -%-20.20s %s\n", "$regex $type", $desc; 999 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc;
975 } 1000 }
976 } else { 1001 } else {
1002 $pattern =~ s/\.$/.*/g;
977 urxvt::log sprintf " %-19.19s %s\n", "$regex:", $type; 1003 urxvt::log sprintf " %-31s %s\n", "$pattern:", $type;
978 } 1004 }
979 } 1005 }
980} 1006}
981 1007
982my $verbosity = $ENV{URXVT_PERL_VERBOSITY}; 1008my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
… …
1002 1028
1003 open my $fh, "<:raw", $path 1029 open my $fh, "<:raw", $path
1004 or die "$path: $!"; 1030 or die "$path: $!";
1005 1031
1006 my $source = 1032 my $source =
1007 "package $pkg; use strict; use utf8; no warnings 'utf8';\n" 1033 "package $pkg; use strict 'vars'; use utf8; no warnings 'utf8';\n"
1008 . "#line 1 \"$path\"\n{\n" 1034 . "#line 1 \"$path\"\n{\n"
1009 . (do { local $/; <$fh> }) 1035 . (do { local $/; <$fh> })
1010 . "\n};\n1"; 1036 . "\n};\n1";
1011 1037
1012 eval $source 1038 eval $source
… …
1035 my @pkg = @TERM_EXT; 1061 my @pkg = @TERM_EXT;
1036 @TERM_EXT = (); 1062 @TERM_EXT = ();
1037 $TERM->register_package ($_) for @pkg; 1063 $TERM->register_package ($_) for @pkg;
1038 } 1064 }
1039 1065
1066 for (
1067 @{ delete $TERM->{perl_ext_3} },
1040 for (grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) { 1068 grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2
1069 ) {
1041 if ($_ eq "default") { 1070 if ($_ eq "default") {
1042 $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);
1043 } elsif (/^-(.*)$/) { 1072 } elsif (/^-(.*)$/) {
1044 delete $ext_arg{$1}; 1073 delete $ext_arg{$1};
1045 } elsif (/^([^<]+)<(.*)>$/) { 1074 } elsif (/^([^<]+)<(.*)>$/) {
… …
1333 and $ext ne ".." 1362 and $ext ne ".."
1334 and open my $fh, "<", "$dir/$ext" 1363 and open my $fh, "<", "$dir/$ext"
1335 or next; 1364 or next;
1336 1365
1337 while (<$fh>) { 1366 while (<$fh>) {
1338 if (/^#:META:RESOURCE:(.*)/) { 1367 if (/^#:META:X_RESOURCE:(.*)/) {
1339 my ($regex, $type, $desc) = split /:/, $1; 1368 my ($pattern, $type, $desc) = split /:/, $1;
1340 $regex =~ s/\$\$/$ext/g; # $$ in regex == extension name 1369 $pattern =~ s/^%(\.|$)/$ext$1/g; # % in pattern == extension name
1370 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
1371 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1372 } else {
1341 $meta{resource}{$regex} = [$ext, $type, $desc]; 1373 $meta{resource}{$pattern} = [$ext, $type, $desc];
1374 }
1342 } elsif (/^\s*(?:#|$)/) { 1375 } elsif (/^\s*(?:#|$)/) {
1343 # skip other comments and empty lines 1376 # skip other comments and empty lines
1344 } else { 1377 } else {
1345 last; # stop parsing on first non-empty non-comment line 1378 last; # stop parsing on first non-empty non-comment line
1346 } 1379 }
… …
1473 1506
1474This 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
1475only one resource database per display, and later invocations might return 1508only one resource database per display, and later invocations might return
1476the wrong resources. 1509the wrong resources.
1477 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
1478=item $success = $term->parse_keysym ($key, $octets) 1527=item $success = $term->parse_keysym ($key, $octets)
1479 1528
1480Adds a key binding exactly as specified via a resource. See the 1529Adds a key binding exactly as specified via a resource. See the
1481C<keysym> resource in the @@RXVT_NAME@@(1) manpage. 1530C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
1482 1531

Diff Legend

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