*** empty log message ***

diff --git a/Changes b/Changes
index e7ef318d53f296cba209747cbfa0855235440fad..b6783b778edff386e129cbee211d7d5f0fbc8403 100644 (file)
--- a/Changes
+++ b/Changes
@@ -11,7 +11,6 @@ TODO: investigate -pe tabbed -g 80x25 being 23 not 24 or 25 lines
       => when setting the constraints, the wm might (correctly)
          resize the outer window, which might result in a smaller window overall.
          or something like that. guys, send me a patch.
-TODO: zeroing scorllback buffer should free memory
 WISH: skipscroll option
 WISH: selection-color-pair instead of reverse video
 WISH: load system-wide config file even if we don't have one
@@ -21,7 +20,6 @@ WISH: http://www120.pair.com/mccarthy/nextstep/intro.htmld/Workspace.html is the
 WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
-TODO: add ctype locale info to some menu to aid the "support"
 TODO: (exg) rxvt -fn -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 U+39b+U+30a wipes out 39b
 8.0
        - specified fonts were incorrectly morphed to bold/italic according to the
@@ -34,6 +32,7 @@ TODO: (exg) rxvt -fn -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 U
         - update to libptytty-1.0.
        - give proper diagnostic when RXVT_SOCKET is too long instead of
           corrupting the stack (patch by exg).
+        - display current terminal locale in option menu.
         - urxvtd no longer crashes when the client sends an inaccessible
           working directory (reported by Roland Baer, possibly fixes gentoo
           bug #143985).

diff --git a/src/perl/option-popup b/src/perl/option-popup
index 1953bab405ccecd9aa45befead13e3b9d09107e3..199ea134eccc4bebd0973ba15b7edb26484ff10e 100644 (file)
--- a/src/perl/option-popup
+++ b/src/perl/option-popup
@@ -39,6 +39,13 @@ sub on_button_press {
          }
       }
 
+      {
+         $popup->add_separator;
+         my $locale = $self->locale;
+         $locale =~ y/\x20-\x7e//cd;
+         $popup->add_title ("Locale: $locale");
+      }
+
       $popup->show;
 
       return 1;

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index de5d62fae69e682df24e47d41f2f443e7c62d1e8..68a351572fb31bd5302b096418854b954f009daf 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -1174,6 +1174,13 @@ rxvt_term::locale_decode (SV *octets)
        OUTPUT:
         RETVAL
 
+char *
+rxvt_term::locale ()
+       CODE:
+        RETVAL = THIS->locale;
+       OUTPUT:
+        RETVAL
+
 #define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
 
 #define TERM_OFFSET_width      TERM_OFFSET(width)