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.232 by sf-exg, Fri May 2 20:33:56 2014 UTC vs.
Revision 1.241 by sf-exg, Fri Oct 10 14:38:02 2014 UTC

288Called whenever a user-configured event is being activated (e.g. via 288Called whenever a user-configured event is being activated (e.g. via
289a C<perl:string> action bound to a key, see description of the B<keysym> 289a C<perl:string> action bound to a key, see description of the B<keysym>
290resource in the urxvt(1) manpage). 290resource in the urxvt(1) manpage).
291 291
292The event is simply the action string. This interface is going away in 292The event is simply the action string. This interface is going away in
293preference to the C<< ->register_keysym_action >> method. 293preference to the C<on_action> hook.
294 294
295=item on_resize_all_windows $term, $new_width, $new_height 295=item on_resize_all_windows $term, $new_width, $new_height
296 296
297Called just after the new window size has been calculated, but before 297Called just after the new window size has been calculated, but before
298windows are actually being resized or hints are being set. If this hook 298windows are actually being resized or hints are being set. If this hook
555no warnings 'utf8'; 555no warnings 'utf8';
556 556
557sub parse_resource { 557sub parse_resource {
558 my ($term, $name, $isarg, $longopt, $flag, $value) = @_; 558 my ($term, $name, $isarg, $longopt, $flag, $value) = @_;
559 559
560 $name =~ y/-/./ if $isarg;
561
562 $term->scan_meta; 560 $term->scan_extensions;
563 561
564 my $r = $term->{meta}{resource}; 562 my $r = $term->{meta}{resource};
565 keys %$r; # reset iterator 563 keys %$r; # reset iterator
566 while (my ($pattern, $v) = each %$r) { 564 while (my ($k, $v) = each %$r) {
567 if ( 565 my $pattern = $k;
566 $pattern =~ y/./-/ if $isarg;
567 my $prefix = $name;
568 my $suffix;
568 $pattern =~ /\.$/ 569 if ($pattern =~ /\-$/) {
569 ? $pattern eq substr $name, 0, length $pattern 570 $prefix = substr $name, 0, length $pattern;
570 : $pattern eq $name 571 $suffix = substr $name, length $pattern;
571 ) { 572 }
573 if ($pattern eq $prefix) {
572 $name = "$urxvt::RESCLASS.$name"; 574 $name = "$urxvt::RESCLASS.$k$suffix";
573 575
574 push @{ $term->{perl_ext_3} }, $v->[0]; 576 push @{ $term->{perl_ext_3} }, $v->[0];
575 577
576 if ($v->[1] eq "boolean") { 578 if ($v->[1] eq "boolean") {
577 $term->put_option_db ($name, $flag ? "true" : "false"); 579 $term->put_option_db ($name, $flag ? "true" : "false");
587} 589}
588 590
589sub usage { 591sub usage {
590 my ($term, $usage_type) = @_; 592 my ($term, $usage_type) = @_;
591 593
592 $term->scan_meta; 594 $term->scan_extensions;
593 595
594 my $r = $term->{meta}{resource}; 596 my $r = $term->{meta}{resource};
595 597
596 for my $pattern (sort keys %$r) { 598 for my $pattern (sort keys %$r) {
597 my ($ext, $type, $desc) = @{ $r->{$pattern} }; 599 my ($ext, $type, $desc) = @{ $r->{$pattern} };
661 my $htype = shift; 663 my $htype = shift;
662 664
663 if ($htype == HOOK_INIT) { 665 if ($htype == HOOK_INIT) {
664 my @dirs = $TERM->perl_libdirs; 666 my @dirs = $TERM->perl_libdirs;
665 667
668 $TERM->scan_extensions;
669
666 my %ext_arg; 670 my %ext_arg;
667 671
668 { 672 {
669 my @init = @TERM_INIT; 673 my @init = @TERM_INIT;
670 @TERM_INIT = (); 674 @TERM_INIT = ();
673 @TERM_EXT = (); 677 @TERM_EXT = ();
674 $TERM->register_package ($_) for @pkg; 678 $TERM->register_package ($_) for @pkg;
675 } 679 }
676 680
677 for ( 681 for (
678 @{ delete $TERM->{perl_ext_3} },
679 grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2 682 grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2
680 ) { 683 ) {
681 if ($_ eq "default") { 684 if ($_ eq "default") {
682 $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback readline); 685
686 $ext_arg{$_} = []
687 for
688 qw(selection option-popup selection-popup readline),
689 @{ delete $TERM->{perl_ext_3} },
690 map $_->[0], values %{ $TERM->{meta}{binding} };
691
692 for ($TERM->_keysym_resources) {
693 next if /^(?:string|command|builtin|builtin-string|perl)/;
694 next unless /^([A-Za-z0-9_\-]+):/;
695
696 my $ext = $1;
697
698 $ext_arg{$ext} = [];
699 }
700
683 } elsif (/^-(.*)$/) { 701 } elsif (/^-(.*)$/) {
684 delete $ext_arg{$1}; 702 delete $ext_arg{$1};
703
685 } elsif (/^([^<]+)<(.*)>$/) { 704 } elsif (/^([^<]+)<(.*)>$/) {
686 push @{ $ext_arg{$1} }, $2; 705 push @{ $ext_arg{$1} }, $2;
706
687 } else { 707 } else {
688 $ext_arg{$_} ||= []; 708 $ext_arg{$_} ||= [];
709 }
710 }
711
712 # now register default key bindings
713 for my $ext (sort keys %ext_arg) {
714 while (my ($k, $v) = each %{ $TERM->{meta}{ext}{$ext}{binding} }) {
715 $TERM->bind_action ($k, "$v->[0]:$v->[1]");
689 } 716 }
690 } 717 }
691 718
692 for my $ext (sort keys %ext_arg) { 719 for my $ext (sort keys %ext_arg) {
693 my @files = grep -f $_, map "$_/$ext", @dirs; 720 my @files = grep -f $_, map "$_/$ext", @dirs;
707 734
708 if (my $cb = $TERM->{_hook}[$htype]) { 735 if (my $cb = $TERM->{_hook}[$htype]) {
709 verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")" 736 verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")"
710 if $verbosity >= 10; 737 if $verbosity >= 10;
711 738
712 for my $pkg ( 739 if ($htype == HOOK_ACTION) {
713 # this hook is only sent to the extension with the name 740 # this hook is only sent to the extension with the name
714 # matching the first arg 741 # matching the first arg
715 $htype == HOOK_KEYBOARD_DISPATCH 742 my $pkg = shift;
716 ? exists $cb->{"urxvt::ext::$_[0]"} ? "urxvt::ext::" . shift : return undef 743 $pkg =~ y/-/_/;
717 : keys %$cb 744 $pkg = "urxvt::ext::$pkg";
745
746 $cb = $cb->{$pkg}
747 or return undef; #TODO: maybe warn user?
748
749 $cb = { $pkg => $cb };
718 ) { 750 }
751
752 for my $pkg (keys %$cb) {
719 my $retval_ = eval { $cb->{$pkg}->($TERM->{_pkg}{$pkg} || $TERM, @_) }; 753 my $retval_ = eval { $cb->{$pkg}->($TERM->{_pkg}{$pkg} || $TERM, @_) };
720 $retval ||= $retval_; 754 $retval ||= $retval_;
721 755
722 if ($@) { 756 if ($@) {
723 $TERM->ungrab; # better to lose the grab than the session 757 $TERM->ungrab; # better to lose the grab than the session
1062 $ENV{URXVT_PERL_LIB}, 1096 $ENV{URXVT_PERL_LIB},
1063 "$ENV{HOME}/.urxvt/ext", 1097 "$ENV{HOME}/.urxvt/ext",
1064 "$LIBDIR/perl" 1098 "$LIBDIR/perl"
1065} 1099}
1066 1100
1067sub scan_meta { 1101# scan for available extensions and collect their metadata
1102sub scan_extensions {
1068 my ($self) = @_; 1103 my ($self) = @_;
1104
1105 return if exists $self->{meta};
1106
1069 my @libdirs = perl_libdirs $self; 1107 my @libdirs = perl_libdirs $self;
1070 1108
1071 return if $self->{meta_libdirs} eq join "\x00", @libdirs; 1109# return if $self->{meta_libdirs} eq join "\x00", @libdirs;#d#
1072 1110
1073 my %meta;
1074
1075 $self->{meta_libdirs} = join "\x00", @libdirs; 1111# $self->{meta_libdirs} = join "\x00", @libdirs;#d#
1076 $self->{meta} = \%meta; 1112 $self->{meta} = \my %meta;
1077 1113
1114 # first gather extensions
1078 for my $dir (reverse @libdirs) { 1115 for my $dir (reverse @libdirs) {
1079 opendir my $fh, $dir 1116 opendir my $fh, $dir
1080 or next; 1117 or next;
1081 for my $ext (readdir $fh) { 1118 for my $ext (readdir $fh) {
1082 $ext !~ /^\./ 1119 $ext !~ /^\./
1083 and open my $fh, "<", "$dir/$ext" 1120 and open my $fh, "<", "$dir/$ext"
1084 or next; 1121 or next;
1085 1122
1123 my %ext = (dir => $dir);
1124
1086 while (<$fh>) { 1125 while (<$fh>) {
1087 if (/^#:META:X_RESOURCE:(.*)/) { 1126 if (/^#:META:(?:X_)?RESOURCE:(.*)/) {
1088 my ($pattern, $type, $desc) = split /:/, $1; 1127 my ($pattern, $type, $desc) = split /:/, $1;
1089 $pattern =~ s/^%(\.|$)/$ext$1/g; # % in pattern == extension name 1128 $pattern =~ s/^%(\.|$)/$ext$1/g; # % in pattern == extension name
1090 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) { 1129 if ($pattern =~ /[^a-zA-Z0-9\-\.]/) {
1091 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n"; 1130 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1092 } else { 1131 } else {
1093 $meta{resource}{$pattern} = [$ext, $type, $desc]; 1132 $ext{resource}{$pattern} = [$ext, $type, $desc];
1094 } 1133 }
1134 } elsif (/^#:META:BINDING:(.*)/) {
1135 my ($keysym, $action) = split /:/, $1;
1136 $ext{binding}{$keysym} = [$ext, $action];
1095 } elsif (/^\s*(?:#|$)/) { 1137 } elsif (/^\s*(?:#|$)/) {
1096 # skip other comments and empty lines 1138 # skip other comments and empty lines
1097 } else { 1139 } else {
1098 last; # stop parsing on first non-empty non-comment line 1140 last; # stop parsing on first non-empty non-comment line
1099 } 1141 }
1100 } 1142 }
1143
1144 $meta{ext}{$ext} = \%ext;
1101 } 1145 }
1146 }
1147
1148 # and now merge resources and bindings
1149 while (my ($k, $v) = each %{ $meta{ext} }) {
1150 #TODO: should check for extensions overriding each other
1151 %{ $meta{resource} } = (%{ $meta{resource} }, %{ $v->{resource} });
1152 %{ $meta{binding} } = (%{ $meta{binding} }, %{ $v->{binding} });
1102 } 1153 }
1103} 1154}
1104 1155
1105=item $term = new urxvt::term $envhashref, $rxvtname, [arg...] 1156=item $term = new urxvt::term $envhashref, $rxvtname, [arg...]
1106 1157
1252 my $res = &x_resource; 1303 my $res = &x_resource;
1253 1304
1254 $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0 1305 $res =~ /^\s*(?:true|yes|on|1)\s*$/i ? 1 : defined $res && 0
1255} 1306}
1256 1307
1257=item $success = $term->parse_keysym ($key, $octets) 1308=item $success = $term->bind_action ($key, $octets)
1258 1309
1259Adds a key binding exactly as specified via a resource. See the 1310Adds a key binding exactly as specified via a C<keysym> resource. See the
1260C<keysym> resource in the urxvt(1) manpage. 1311C<keysym> resource in the urxvt(1) manpage.
1261 1312
1262=item $rend = $term->rstyle ([$new_rstyle]) 1313=item $rend = $term->rstyle ([$new_rstyle])
1263 1314
1264Return and optionally change the current rendition. Text that is output by 1315Return and optionally change the current rendition. Text that is output by
1445=item $term->tt_write ($octets) 1496=item $term->tt_write ($octets)
1446 1497
1447Write the octets given in C<$octets> to the tty (i.e. as program input). To 1498Write the octets given in C<$octets> to the tty (i.e. as program input). To
1448pass characters instead of octets, you should convert your strings first 1499pass characters instead of octets, you should convert your strings first
1449to the locale-specific encoding using C<< $term->locale_encode >>. 1500to the locale-specific encoding using C<< $term->locale_encode >>.
1501
1502=item $term->tt_write_user_input ($octets)
1503
1504Like C<tt_write>, but should be used when writing strings in response to
1505the user pressing a key, to invoke the additional actions requested by
1506the user for that case (C<tt_write> doesn't do that).
1507
1508The typical use case would be inside C<on_action> hooks.
1450 1509
1451=item $term->tt_paste ($octets) 1510=item $term->tt_paste ($octets)
1452 1511
1453Write the octets given in C<$octets> to the tty as a paste, converting NL to 1512Write the octets given in C<$octets> to the tty as a paste, converting NL to
1454CR and bracketing the data with control sequences if bracketed paste mode 1513CR and bracketing the data with control sequences if bracketed paste mode

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines