repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: acf0dfc80ba01e3d29632021f6bc094b29aea5a3:
path_to: 
revision_to: 

commit acf0dfc80ba01e3d29632021f6bc094b29aea5a3
Author: Marc Lehmann 
Date:   Mon Jan 9 19:25:57 2006 +0000

    *** empty log message ***

diff --git a/src/perl/selection-popup b/src/perl/selection-popup

--- a/src/perl/selection-popup
+++ b/src/perl/selection-popup
@@ -55,7 +55,7 @@ sub on_button_press {
          $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });

          urxvt::safe
-            and $add_button->("eval perl expression" => sub { $_ = eval urxvt::untaint $_ });
+            and $add_button->("eval perl expression" => sub { no warnings; $_ = eval urxvt::untaint $_ });

          /^(\S+):(\d+):?$/
             and $add_button->("vi-commands to load '$1'" => sub { s/^(\S+):(\d+):?$/\x1b:e $1\x0d:$2\x0d/ });
diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs

--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -936,8 +936,15 @@ rxvt_term::ModLevel3Mask ()

 char *
 rxvt_term::display_id ()
+	ALIAS:
+           display_id = 0
+           locale     = 1
 	CODE:
-        RETVAL = THIS->display->id;
+        switch (ix)
+          {
+            case 0: RETVAL = THIS->display->id; break;
+            case 1: RETVAL = THIS->locale;      break;
+          }
         OUTPUT:
         RETVAL

diff --git a/src/urxvt.pm b/src/urxvt.pm

--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -1175,7 +1175,7 @@ sub add_separator {
    $self->add_item ({
       rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" },
       text => "",
-      render => sub { $sep x $urxvt::TERM->ncol },
+      render => sub { $sep x $self->{term}->ncol },
       activate => sub { },
    });
 }
@@ -1215,6 +1215,8 @@ sub show {

    local $urxvt::popup::self = $self;

+   local $ENV{LC_ALL} = $self->{term}->locale;
+
    urxvt->new ("--perl-lib" => "", "--perl-ext-common" => "", "-pty-fd" => -1, "-sl" => 0, "-b" => 0,
                "--transient-for" => $self->{term}->parent,
                "-display" => $self->{term}->display_id,

-----END OF PAGE-----