add iso14755_52 resource to disable iso14755 5.2.

diff --git a/Changes b/Changes
index 513163aa52a234fca63eceb2eddc8b4e1f7de9c2..c9d61742b8be4a03290eed83d933fa904180e96a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -31,6 +31,7 @@ DUMB: support tex fonts
           digit.
         - go with the times and expect x11 library files in /usr/lib, not
           /usr/X11R6/lib.
+        - add iso14755_52 resource to disable iso14755 5.2.
 
 8.2  Sat Feb 17 21:35:28 CET 2007
        - fix make depend in src/, reported by exg.

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index ecb6d9b6b7a285e862de5cf8610b9a45bdc52d75..ecae48c0d295550fe7ea00b6013ed2c7bc876522 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -1204,6 +1204,10 @@ Compile I<frills>: Sets the WM_TRANSIENT_FOR property to the given window id.
 Compile I<frills>: Sets override-redirect for the terminal window, making
 it almost invisible to window managers; option B<-override-redirect>.
 
+=item B<iso14755_52:> I<boolean>
+
+Turn on/off ISO 14755 5.2 mode (default enabled).
+
 =back
 
 =head1 THE SCROLLBAR

diff --git a/src/command.C b/src/command.C
index 4d71cc58393bd147e15e25fa9376c38c1a2f993f..4db610ad927eedc4529c24556970d30ac0152582 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -975,7 +975,7 @@ rxvt_term::key_release (XKeyEvent &ev)
         if (iso14755buf & ISO_14755_51)
           commit_iso14755 ();
 #if ISO_14755
-        else if (iso14755buf & ISO_14755_STARTED)
+        else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
           {
             iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
 

diff --git a/src/init.C b/src/init.C
index 7e910cd88ebdba1bef811e4f8ba84c2697516d45..3f035360aaa1f212104c3f98b693bc85375753b9 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -220,6 +220,7 @@ rxvt_term::init_vars ()
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
+  set_option (Opt_iso14755_52);
 
   return true;
 }

diff --git a/src/optinc.h b/src/optinc.h
index 771d413e2d65ea913ac821e5e555aed552de425b..2c393d556ac2dbba40df19be06fe3007ff5a6975 100644 (file)
--- a/src/optinc.h
+++ b/src/optinc.h
@@ -48,4 +48,9 @@
 #else
  nodef(intensityStyles)
 #endif
+#if ISO_14755
+ def(iso14755_52,          31)
+#else
+ nodef(iso14755_52)
+#endif
 

diff --git a/src/rsinc.h b/src/rsinc.h
index 6bf061b8b0080c1e3f2a1f007d83ed38b745cd78..8b717ba71857349c7a4eaafb9923bd11fdff761d 100644 (file)
--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -111,6 +111,9 @@
   def (perl_ext_2)
   def (perl_lib)
 #endif
+#if ISO_14755
+  def (iso14755_52)
+#endif
 #ifdef HAVE_AFTERIMAGE
   def (blendtype)
   def (blurradius)

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 57e4691cdd93b7666c685547da02cc3cd7521721..6ae89021b7f0a790984ddb8167c4f3c8aeb0211f 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -260,7 +260,9 @@ optList[] = {
               RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
               STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
 #endif
-
+#if ISO_14755
+              BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
+#endif
 #ifdef HAVE_AFTERIMAGE
               STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
               STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
@@ -548,6 +550,7 @@ rxvt_term::get_options (int argc, const char *const *argv)
                * X resources to set these values before we settle for
                * default values
                */
+
               if (optList[entry].doff != -1)
                 {
                   if (flag == resval_on && !argv [i+1])