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.60 by root, Mon Jan 9 01:21:43 2006 UTC vs.
Revision 1.70 by root, Mon Jan 9 23:00:07 2006 UTC

65 65
66=item selection-popup (enabled by default) 66=item selection-popup (enabled by default)
67 67
68Binds a popup menu to Ctrl-Button3 that lets you convert the selection 68Binds a popup menu to Ctrl-Button3 that lets you convert the selection
69text into various other formats/action. 69text into various other formats/action.
70
71=item searchable-scrollback (enabled by default)
72
73Adds regex search functionality to the scrollback buffer, triggered by a
74hotkey (default: C<M-s>). When in search mode, terminal input/output is
75suspended, C</> starts an incremental regex search, C<n> searches further,
76C<p> jumps to the previous match. C<enter> leaves search mode at the
77current position and C<escape> returns to the original position.
70 78
71=item digital-clock 79=item digital-clock
72 80
73Displays a digital clock using the built-in overlay. 81Displays a digital clock using the built-in overlay.
74 82
124Either binary data or - more common - a text string encoded in a 132Either binary data or - more common - a text string encoded in a
125locale-specific way. 133locale-specific way.
126 134
127=back 135=back
128 136
137=head2 Extension Objects
138
139Very perl extension is a perl class. A separate perl object is created
140for each terminal and each extension and passed as the first parameter to
141hooks. So extensions can use their C<$self> object without having to think
142about other extensions, with the exception of methods and members that
143begin with an underscore character C<_>: these are reserved for internal
144use.
145
146Although it isn't a C<urxvt::term> object, you can call all methods of the
147C<urxvt::term> class on this object.
148
149It has the following methods and data members:
150
151=over 4
152
153=item $urxvt_term = $self->{term}
154
155Returns the C<urxvt::term> object associated with this instance of the
156extension. This member I<must not> be changed in any way.
157
158=item $self->enable ($hook_name => $cb, [$hook_name => $cb..])
159
160Dynamically enable the given hooks (named without the C<on_> prefix) for
161this extension, replacing any previous hook. This is useful when you want
162to overwrite time-critical hooks only temporarily.
163
164=item $self->disable ($hook_name[, $hook_name..])
165
166Dynamically disable the given hooks.
167
168=back
169
129=head2 Hooks 170=head2 Hooks
130 171
131The following subroutines can be declared in extension files, and will be 172The following subroutines can be declared in extension files, and will be
132called whenever the relevant event happens. 173called whenever the relevant event happens.
133 174
134The first argument passed to them is an object private to each terminal 175The first argument passed to them is an extension oject as described in
135and extension package. You can call all C<urxvt::term> methods on it, but 176the in the C<Extension Objects> section.
136its not a real C<urxvt::term> object. Instead, the real C<urxvt::term>
137object that is shared between all packages is stored in the C<term>
138member. It is, however, blessed intot he package of the extension script,
139so for all practical purposes you can treat an extension script as a class.
140 177
141All of them must return a boolean value. If it is true, then the event 178B<All> of these hooks must return a boolean value. If it is true, then the
142counts as being I<consumed>, and the invocation of other hooks is skipped, 179event counts as being I<consumed>, and the invocation of other hooks is
143and the relevant action might not be carried out by the C++ code. 180skipped, and the relevant action might not be carried out by the C++ code.
144 181
145When in doubt, return a false value (preferably C<()>). 182I<< When in doubt, return a false value (preferably C<()>). >>
146 183
147=over 4 184=over 4
148 185
149=item on_init $term 186=item on_init $term
150 187
204than the scroll back buffer or the terminal. 241than the scroll back buffer or the terminal.
205 242
206It is called before lines are scrolled out (so rows 0 .. min ($lines - 1, 243It is called before lines are scrolled out (so rows 0 .. min ($lines - 1,
207$nrow - 1) represent the lines to be scrolled out). C<$saved> is the total 244$nrow - 1) represent the lines to be scrolled out). C<$saved> is the total
208number of lines that will be in the scrollback buffer. 245number of lines that will be in the scrollback buffer.
209
210=item on_tty_activity $term *NYI*
211
212Called whenever the program(s) running in the urxvt window send output.
213 246
214=item on_osc_seq $term, $string 247=item on_osc_seq $term, $string
215 248
216Called whenever the B<ESC ] 777 ; string ST> command sequence (OSC = 249Called whenever the B<ESC ] 777 ; string ST> command sequence (OSC =
217operating system command) is processed. Cursor position and other state 250operating system command) is processed. Cursor position and other state
271=item on_focus_out $term 304=item on_focus_out $term
272 305
273Called wheneever the window loses keyboard focus, before rxvt-unicode does 306Called wheneever the window loses keyboard focus, before rxvt-unicode does
274focus out processing. 307focus out processing.
275 308
276=item on_key_press $term, $event, $octets 309=item on_key_press $term, $event, $keysym, $octets
277 310
278=item on_key_release $term, $event 311=item on_key_release $term, $event, $keysym
279 312
280=item on_button_press $term, $event 313=item on_button_press $term, $event
281 314
282=item on_button_release $term, $event 315=item on_button_release $term, $event
283 316
337that calls this function. 370that calls this function.
338 371
339Using this function has the advantage that its output ends up in the 372Using this function has the advantage that its output ends up in the
340correct place, e.g. on stderr of the connecting urxvtc client. 373correct place, e.g. on stderr of the connecting urxvtc client.
341 374
375=item $is_safe = urxvt::safe
376
377Returns true when it is safe to do potentially unsafe things, such as
378evaluating perl code specified by the user. This is true when urxvt was
379started setuid or setgid.
380
342=item $time = urxvt::NOW 381=item $time = urxvt::NOW
343 382
344Returns the "current time" (as per the event loop). 383Returns the "current time" (as per the event loop).
345 384
346=item urxvt::CurrentTime 385=item urxvt::CurrentTime
409 448
410package urxvt; 449package urxvt;
411 450
412use utf8; 451use utf8;
413use strict; 452use strict;
453use Carp ();
414use Scalar::Util (); 454use Scalar::Util ();
415use List::Util (); 455use List::Util ();
416 456
417our $VERSION = 1; 457our $VERSION = 1;
418our $TERM; 458our $TERM;
419our @HOOKNAME; 459our @HOOKNAME;
460our %HOOKTYPE = map +($HOOKNAME[$_] => $_), 0..$#HOOKNAME;
420our %OPTION; 461our %OPTION;
421our $LIBDIR; 462our $LIBDIR;
422 463
423BEGIN { 464BEGIN {
424 urxvt->bootstrap; 465 urxvt->bootstrap;
443sub verbose { 484sub verbose {
444 my ($level, $msg) = @_; 485 my ($level, $msg) = @_;
445 warn "$msg\n" if $level <= $verbosity; 486 warn "$msg\n" if $level <= $verbosity;
446} 487}
447 488
448# find on_xxx subs in the package and register them
449# as hooks
450sub register_package($) {
451 my ($pkg) = @_;
452
453 for my $htype (0.. $#HOOKNAME) {
454 my $name = $HOOKNAME[$htype];
455
456 my $ref = $pkg->can ("on_" . lc $name)
457 or next;
458
459 $TERM->{_hook}[$htype]{$pkg} = $ref;
460 $hook_count[$htype]++
461 or set_should_invoke $htype, 1;
462 }
463}
464
465my $extension_pkg = "extension0000"; 489my $extension_pkg = "extension0000";
466my %extension_pkg; 490my %extension_pkg;
467 491
468# load a single script into its own package, once only 492# load a single script into its own package, once only
469sub extension_package($) { 493sub extension_package($) {
475 verbose 3, "loading extension '$path' into package '$pkg'"; 499 verbose 3, "loading extension '$path' into package '$pkg'";
476 500
477 open my $fh, "<:raw", $path 501 open my $fh, "<:raw", $path
478 or die "$path: $!"; 502 or die "$path: $!";
479 503
504 my $source = untaint
480 my $source = untaint "package $pkg; use strict; use utf8;\n" 505 "package $pkg; use strict; use utf8;\n"
481 . "use base urxvt::term::proxy::;\n" 506 . "use base urxvt::term::proxy::;\n"
482 . "#line 1 \"$path\"\n{\n" 507 . "#line 1 \"$path\"\n{\n"
483 . (do { local $/; <$fh> }) 508 . (do { local $/; <$fh> })
484 . "\n};\n1"; 509 . "\n};\n1";
485 510
511 eval $source
486 eval $source or die "$path: $@"; 512 or die "$path: $@";
487 513
488 $pkg 514 $pkg
489 } 515 }
490} 516}
491 517
497 my $htype = shift; 523 my $htype = shift;
498 524
499 if ($htype == 0) { # INIT 525 if ($htype == 0) { # INIT
500 my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl"); 526 my @dirs = ((split /:/, $TERM->resource ("perl_lib")), "$LIBDIR/perl");
501 527
502 my %want_ext; 528 my %ext_arg;
503 529
504 for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) { 530 for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
505 if ($_ eq "default") { 531 if ($_ eq "default") {
506 $want_ext{$_}++ for qw(selection option-popup selection-popup); 532 $ext_arg{$_} ||= [] for qw(selection option-popup selection-popup searchable-scrollback);
507 } elsif (/^-(.*)$/) { 533 } elsif (/^-(.*)$/) {
508 delete $want_ext{$1}; 534 delete $ext_arg{$1};
535 } elsif (/^([^<]+)<(.*)>$/) {
536 push @{ $ext_arg{$1} }, $2;
509 } else { 537 } else {
510 $want_ext{$_}++; 538 $ext_arg{$_} ||= [];
511 } 539 }
512 } 540 }
513 541
514 for my $ext (keys %want_ext) { 542 while (my ($ext, $argv) = each %ext_arg) {
515 my @files = grep -f $_, map "$_/$ext", @dirs; 543 my @files = grep -f $_, map "$_/$ext", @dirs;
516 544
517 if (@files) { 545 if (@files) {
518 register_package extension_package $files[0]; 546 $TERM->register_package (extension_package $files[0], $argv);
519 } else { 547 } else {
520 warn "perl extension '$ext' not found in perl library search path\n"; 548 warn "perl extension '$ext' not found in perl library search path\n";
521 } 549 }
522 } 550 }
523 551
532 if $verbosity >= 10; 560 if $verbosity >= 10;
533 561
534 keys %$cb; 562 keys %$cb;
535 563
536 while (my ($pkg, $cb) = each %$cb) { 564 while (my ($pkg, $cb) = each %$cb) {
537 eval { 565 $retval = eval { $cb->($TERM->{_pkg}{$pkg}, @_) }
538 $retval = $cb->(
539 $TERM->{_pkg}{$pkg} ||= do {
540 my $proxy = bless { }, $pkg;
541 Scalar::Util::weaken ($proxy->{term} = $TERM);
542 $proxy
543 },
544 @_,
545 ) and last; 566 and last;
546 }; 567
547 if ($@) { 568 if ($@) {
548 $TERM->ungrab; # better to lose the grab than the session 569 $TERM->ungrab; # better to lose the grab than the session
549 warn $@; 570 warn $@;
550 } 571 }
551 } 572 }
552 } 573 }
553 574
554 if ($htype == 1) { # DESTROY 575 if ($htype == 1) { # DESTROY
555 # remove hooks if unused
556 if (my $hook = $TERM->{_hook}) { 576 if (my $hook = delete $TERM->{_hook}) {
557 for my $htype (0..$#$hook) { 577 for my $htype (0..$#$hook) {
558 $hook_count[$htype] -= scalar keys %{ $hook->[$htype] || {} } 578 $hook_count[$htype] -= scalar keys %{ $hook->[$htype] || {} }
559 or set_should_invoke $htype, 0; 579 or set_should_invoke $htype, 0;
560 } 580 }
561 } 581 }
570 $retval 590 $retval
571} 591}
572 592
573# urxvt::term::proxy 593# urxvt::term::proxy
574 594
575sub urxvt::term::proxy::AUTOLOAD { 595package urxvt::term::proxy;
576 $urxvt::term::proxy::AUTOLOAD =~ /:([^:]+)$/ 596
597sub enable {
598 my ($self, %hook) = @_;
599 my $pkg = $self->{_pkg};
600
601 while (my ($name, $cb) = each %hook) {
602 my $htype = $HOOKTYPE{uc $name};
603 defined $htype
604 or Carp::croak "unsupported hook type '$name'";
605
606 unless (exists $self->{term}{_hook}[$htype]{$pkg}) {
607 $hook_count[$htype]++
608 or urxvt::set_should_invoke $htype, 1;
609 }
610
611 $self->{term}{_hook}[$htype]{$pkg} = $cb;
612 }
613}
614
615sub disable {
616 my ($self, @hook) = @_;
617 my $pkg = $self->{_pkg};
618
619 for my $name (@hook) {
620 my $htype = $HOOKTYPE{uc $name};
621 defined $htype
622 or Carp::croak "unsupported hook type '$name'";
623
624 if (delete $self->{term}{_hook}[$htype]{$pkg}) {
625 --$hook_count[$htype]
626 or urxvt::set_should_invoke $htype, 0;
627 }
628 }
629}
630
631our $AUTOLOAD;
632
633sub AUTOLOAD {
634 $AUTOLOAD =~ /:([^:]+)$/
577 or die "FATAL: \$AUTOLOAD '$urxvt::term::proxy::AUTOLOAD' unparsable"; 635 or die "FATAL: \$AUTOLOAD '$AUTOLOAD' unparsable";
578 636
579 eval qq{ 637 eval qq{
580 sub $urxvt::term::proxy::AUTOLOAD { 638 sub $AUTOLOAD {
581 my \$proxy = shift; 639 my \$proxy = shift;
582 \$proxy->{term}->$1 (\@_) 640 \$proxy->{term}->$1 (\@_)
583 } 641 }
584 1 642 1
585 } or die "FATAL: unable to compile method forwarder: $@"; 643 } or die "FATAL: unable to compile method forwarder: $@";
586 644
587 goto &$urxvt::term::proxy::AUTOLOAD; 645 goto &$AUTOLOAD;
588} 646}
589 647
590sub urxvt::term::proxy::DESTROY { 648sub DESTROY {
591 # nop 649 # nop
592} 650}
593 651
594# urxvt::destroy_hook 652# urxvt::destroy_hook
595 653
662 ${$_[0]}++; 720 ${$_[0]}++;
663} 721}
664 722
665sub urxvt::anyevent::condvar::wait { 723sub urxvt::anyevent::condvar::wait {
666 unless (${$_[0]}) { 724 unless (${$_[0]}) {
667 require Carp;
668 Carp::croak ("AnyEvent->condvar blocking wait unsupported in urxvt, use a non-blocking API"); 725 Carp::croak "AnyEvent->condvar blocking wait unsupported in urxvt, use a non-blocking API";
669 } 726 }
670} 727}
671 728
672package urxvt::term; 729package urxvt::term;
673 730
674=head2 The C<urxvt::term> Class 731=head2 The C<urxvt::term> Class
675 732
676=over 4 733=over 4
734
735=cut
736
737# find on_xxx subs in the package and register them
738# as hooks
739sub register_package {
740 my ($self, $pkg, $argv) = @_;
741
742 my $proxy = bless {
743 _pkg => $pkg,
744 argv => $argv,
745 }, $pkg;
746 Scalar::Util::weaken ($proxy->{term} = $self);
747
748 $self->{_pkg}{$pkg} = $proxy;
749
750 for my $name (@HOOKNAME) {
751 if (my $ref = $pkg->can ("on_" . lc $name)) {
752 $proxy->enable ($name => $ref);
753 }
754 }
755}
677 756
678=item $term->destroy 757=item $term->destroy
679 758
680Destroy the terminal object (close the window, free resources etc.). 759Destroy the terminal object (close the window, free resources etc.).
681 760
735 my ($self, $name) = (shift, shift); 814 my ($self, $name) = (shift, shift);
736 unshift @_, $self, $name, ($name =~ s/\s*\+\s*(\d+)$// ? $1 : 0); 815 unshift @_, $self, $name, ($name =~ s/\s*\+\s*(\d+)$// ? $1 : 0);
737 &urxvt::term::_resource 816 &urxvt::term::_resource
738} 817}
739 818
819=item $success = $term->parse_keysym ($keysym_spec, $command_string)
820
821Adds a keymap translation exactly as specified via a resource. See the
822C<keysym> resource in the @@RXVT_NAME@@(1) manpage.
823
740=item $rend = $term->rstyle ([$new_rstyle]) 824=item $rend = $term->rstyle ([$new_rstyle])
741 825
742Return and optionally change the current rendition. Text that is output by 826Return and optionally change the current rendition. Text that is output by
743the terminal application will use this style. 827the terminal application will use this style.
744 828
763 847
764=item $oldtext = $term->selection ([$newtext]) 848=item $oldtext = $term->selection ([$newtext])
765 849
766Return the current selection text and optionally replace it by C<$newtext>. 850Return the current selection text and optionally replace it by C<$newtext>.
767 851
768#=item $term->overlay ($x, $y, $text) 852=item $term->overlay_simple ($x, $y, $text)
769# 853
770#Create a simple multi-line overlay box. See the next method for details. 854Create a simple multi-line overlay box. See the next method for details.
771# 855
772#=cut 856=cut
773# 857
774#sub urxvt::term::scr_overlay { 858sub overlay_simple {
775# my ($self, $x, $y, $text) = @_; 859 my ($self, $x, $y, $text) = @_;
776# 860
777# my @lines = split /\n/, $text; 861 my @lines = split /\n/, $text;
778# 862
779# my $w = 0; 863 my $w = List::Util::max map $self->strwidth ($_), @lines;
780# for (map $self->strwidth ($_), @lines) { 864
781# $w = $_ if $w < $_;
782# }
783#
784# $self->scr_overlay_new ($x, $y, $w, scalar @lines); 865 my $overlay = $self->overlay ($x, $y, $w, scalar @lines);
785# $self->scr_overlay_set (0, $_, $lines[$_]) for 0.. $#lines; 866 $overlay->set (0, $_, $lines[$_]) for 0.. $#lines;
786#} 867
868 $overlay
869}
787 870
788=item $term->overlay ($x, $y, $width, $height[, $rstyle[, $border]]) 871=item $term->overlay ($x, $y, $width, $height[, $rstyle[, $border]])
789 872
790Create a new (empty) overlay at the given position with the given 873Create a new (empty) overlay at the given position with the given
791width/height. C<$rstyle> defines the initial rendition style 874width/height. C<$rstyle> defines the initial rendition style
858 941
859=item $string = $term->locale_decode ($octets) 942=item $string = $term->locale_decode ($octets)
860 943
861Convert the given locale-encoded octets into a perl string. 944Convert the given locale-encoded octets into a perl string.
862 945
946=item $term->scr_xor_span ($beg_row, $beg_col, $end_row, $end_col[, $rstyle])
947
948XORs the rendition values in the given span with the provided value
949(default: C<RS_RVid>). Useful in refresh hooks to provide effects similar
950to the selection.
951
952=item $term->scr_xor_rect ($beg_row, $beg_col, $end_row, $end_col[, $rstyle1[, $rstyle2]])
953
954Similar to C<scr_xor_span>, but xors a rectangle instead. Trailing
955whitespace will additionally be xored with the C<$rstyle2>, which defaults
956to C<RS_RVid | RS_Uline>, which removes reverse video again and underlines
957it instead.
958
959=item $term->scr_bell
960
961Ring the bell!
962
863=item $term->scr_add_lines ($string) 963=item $term->scr_add_lines ($string)
864 964
865Write the given text string to the screen, as if output by the application 965Write the given text string to the screen, as if output by the application
866running inside the terminal. It may not contain command sequences (escape 966running inside the terminal. It may not contain command sequences (escape
867codes), but is free to use line feeds, carriage returns and tabs. The 967codes), but is free to use line feeds, carriage returns and tabs. The
881 981
882Write the octets given in C<$data> to the tty (i.e. as program input). To 982Write the octets given in C<$data> to the tty (i.e. as program input). To
883pass characters instead of octets, you should convert your strings first 983pass characters instead of octets, you should convert your strings first
884to the locale-specific encoding using C<< $term->locale_encode >>. 984to the locale-specific encoding using C<< $term->locale_encode >>.
885 985
986=item $old_events = $term->pty_ev_events ([$new_events])
987
988Replaces the event mask of the pty watcher by the given event mask. Can
989be used to suppress input and output handling to the pty/tty. See the
990description of C<< urxvt::timer->events >>. Make sure to always restore
991the previous value.
992
886=item $windowid = $term->parent 993=item $windowid = $term->parent
887 994
888Return the window id of the toplevel window. 995Return the window id of the toplevel window.
889 996
890=item $windowid = $term->vt 997=item $windowid = $term->vt
914=item $nrow_plus_saveLines = $term->total_rows 1021=item $nrow_plus_saveLines = $term->total_rows
915 1022
916=item $lines_in_scrollback = $term->nsaved 1023=item $lines_in_scrollback = $term->nsaved
917 1024
918Return various integers describing terminal characteristics. 1025Return various integers describing terminal characteristics.
1026
1027=item $lc_ctype = $term->locale
1028
1029Returns the LC_CTYPE category string used by this rxvt-unicode.
1030
1031=item $x_display = $term->display_id
1032
1033Return the DISPLAY used by rxvt-unicode.
919 1034
920=item $modifiermask = $term->ModLevel3Mask 1035=item $modifiermask = $term->ModLevel3Mask
921 1036
922=item $modifiermask = $term->ModMetaMask 1037=item $modifiermask = $term->ModMetaMask
923 1038
1100 $offset / $self->{ncol} + $self->{beg}, 1215 $offset / $self->{ncol} + $self->{beg},
1101 $offset % $self->{ncol} 1216 $offset % $self->{ncol}
1102 ) 1217 )
1103} 1218}
1104 1219
1105=item ($row, $col) = $line->coord_of ($offset)
1106=item $text = $term->special_encode $string 1220=item $text = $term->special_encode $string
1107 1221
1108Converts a perl string into the special encoding used by rxvt-unicode, 1222Converts a perl string into the special encoding used by rxvt-unicode,
1109where one character corresponds to one screen cell. See 1223where one character corresponds to one screen cell. See
1110C<< $term->ROW_t >> for details. 1224C<< $term->ROW_t >> for details.
1112=item $string = $term->special_decode $text 1226=item $string = $term->special_decode $text
1113 1227
1114Converts rxvt-unicodes text reprsentation into a perl string. See 1228Converts rxvt-unicodes text reprsentation into a perl string. See
1115C<< $term->ROW_t >> for details. 1229C<< $term->ROW_t >> for details.
1116 1230
1231=item $success = $term->grab_button ($button, $modifiermask)
1232
1233Registers a synchronous button grab. See the XGrabButton manpage.
1234
1235=item $success = $term->grab ($eventtime[, $sync])
1236
1237Calls XGrabPointer and XGrabKeyboard in asynchronous (default) or
1238synchronous (C<$sync> is true). Also remembers the grab timestampe.
1239
1240=item $term->allow_events_async
1241
1242Calls XAllowEvents with AsyncBoth for the most recent grab.
1243
1244=item $term->allow_events_sync
1245
1246Calls XAllowEvents with SyncBoth for the most recent grab.
1247
1248=item $term->allow_events_replay
1249
1250Calls XAllowEvents with both ReplayPointer and ReplayKeyboard for the most
1251recent grab.
1252
1253=item $term->ungrab
1254
1255Calls XUngrab for the most recent grab. Is called automatically on
1256evaluation errors, as it is better to lose the grab in the error case as
1257the session.
1258
1117=back 1259=back
1118 1260
1119=cut 1261=cut
1120 1262
1121package urxvt::popup; 1263package urxvt::popup;
1139} 1281}
1140 1282
1141sub add_separator { 1283sub add_separator {
1142 my ($self, $sep) = @_; 1284 my ($self, $sep) = @_;
1143 1285
1144 $sep ||= ""; 1286 $sep ||= "=";
1145 1287
1146 $self->add_item ({ 1288 $self->add_item ({
1147 rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" }, 1289 rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" },
1148 text => "", 1290 text => "",
1149 render => sub { $sep x $urxvt::TERM->ncol }, 1291 render => sub { $sep x $self->{term}->ncol },
1150 activate => sub { }, 1292 activate => sub { },
1151 }); 1293 });
1152} 1294}
1153 1295
1154sub add_title { 1296sub add_title {
1162} 1304}
1163 1305
1164sub add_button { 1306sub add_button {
1165 my ($self, $text, $cb) = @_; 1307 my ($self, $text, $cb) = @_;
1166 1308
1167 $self->add_item ({ type => "button", text => "[ $text ]", activate => $cb}); 1309 $self->add_item ({ type => "button", text => $text, activate => $cb});
1168} 1310}
1169 1311
1170sub add_toggle { 1312sub add_toggle {
1171 my ($self, $text, $cb, $value) = @_; 1313 my ($self, $text, $cb, $value) = @_;
1172 1314
1184sub show { 1326sub show {
1185 my ($self) = @_; 1327 my ($self) = @_;
1186 1328
1187 local $urxvt::popup::self = $self; 1329 local $urxvt::popup::self = $self;
1188 1330
1331 local $ENV{LC_ALL} = $self->{term}->locale;
1332
1189 urxvt->new ("--perl-lib" => "", "--perl-ext-common" => "", "-pty-fd" => -1, "-sl" => 0, "-b" => 0, 1333 urxvt->new ("--perl-lib" => "", "--perl-ext-common" => "", "-pty-fd" => -1, "-sl" => 0, "-b" => 0,
1190 "--transient-for" => $self->{term}->parent, 1334 "--transient-for" => $self->{term}->parent,
1335 "-display" => $self->{term}->display_id,
1191 "-pe" => "urxvt-popup") 1336 "-pe" => "urxvt-popup")
1192 or die "unable to create popup window\n"; 1337 or die "unable to create popup window\n";
1193} 1338}
1194 1339
1195sub DESTROY { 1340sub DESTROY {
1258 1403
1259 $term->{socket} = ... 1404 $term->{socket} = ...
1260 $term->{iow} = urxvt::iow 1405 $term->{iow} = urxvt::iow
1261 ->new 1406 ->new
1262 ->fd (fileno $term->{socket}) 1407 ->fd (fileno $term->{socket})
1263 ->events (1) # wait for read data 1408 ->events (urxvt::EVENT_READ)
1264 ->start 1409 ->start
1265 ->cb (sub { 1410 ->cb (sub {
1266 my ($iow, $revents) = @_; 1411 my ($iow, $revents) = @_;
1267 # $revents must be 1 here, no need to check 1412 # $revents must be 1 here, no need to check
1268 sysread $term->{socket}, my $buf, 8192 1413 sysread $term->{socket}, my $buf, 8192
1285 1430
1286Set the filedescriptor (not handle) to watch. 1431Set the filedescriptor (not handle) to watch.
1287 1432
1288=item $iow = $iow->events ($eventmask) 1433=item $iow = $iow->events ($eventmask)
1289 1434
1290Set the event mask to watch. Bit #0 (value C<1>) enables watching for read 1435Set the event mask to watch. The only allowed values are
1291data, Bit #1 (value C<2>) enables watching for write data. 1436C<urxvt::EVENT_READ> and C<urxvt::EVENT_WRITE>, which might be ORed
1437together, or C<urxvt::EVENT_NONE>.
1292 1438
1293=item $iow = $iow->start 1439=item $iow = $iow->start
1294 1440
1295Start watching for requested events on the given handle. 1441Start watching for requested events on the given handle.
1296 1442

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines