Add iso14755 option to disable ISO 14755 at runtime.

diff --git a/Changes b/Changes
index e0f04e3cbececfee6137969b1ae8f85035f40364..3c7f541ac159bbdaaaeba2a008903f6e8e2cd502 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 rxvt-unicode changelog <= google-friendly title
 
+       - new iso14755 option to disable ISO 14755 at runtime (Emanuele Giaquinta).
+
 9.07 Wed Dec 30 07:07:18 CET 2009
        - port to glibc-2.10 changes (strchr etc. returning const char *
           in C++), based on patches by Milos Jakubicek and Oliver Mader.

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 871251e1064ad9e64300843d76c806adb6f6e46c..81fd8dcd2ca651ee765bc0a8d75ff64eae8a624c 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -1298,6 +1298,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:> I<boolean>
+
+Turn on/off ISO 14755 (default enabled).
+
 =item B<iso14755_52:> I<boolean>
 
 Turn on/off ISO 14755 5.2 mode (default enabled).

diff --git a/src/command.C b/src/command.C
index 84efe3b9b7af3321fda8618a8b598d142be8e882..e9c2a1683188e38076455c8a412feff0b1ee2e31 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -621,8 +621,9 @@ rxvt_term::key_press (XKeyEvent &ev)
               iso14755buf = 0;
             }
         }
-      else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
-               || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
+      else if (option (Opt_iso14755) &&
+               ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
+                || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
         if (!(iso14755buf & ISO_14755_STARTED))
           {
             iso14755buf |= ISO_14755_STARTED;

diff --git a/src/init.C b/src/init.C
index a352236ebd540f56ee65e1f5264aa5d891940f19..9af7bae70aa2c88f011868c3ef36de01acc15408 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -310,6 +310,7 @@ rxvt_term::init_vars ()
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
+  set_option (Opt_iso14755);
   set_option (Opt_iso14755_52);
   set_option (Opt_buffered);
 }

diff --git a/src/optinc.h b/src/optinc.h
index 4492d82771e13690165c82c6b26671279e5f992a..ee046cc5ef6a4f86532ef52e712e67e696eea95c 100644 (file)
--- a/src/optinc.h
+++ b/src/optinc.h
@@ -52,8 +52,10 @@
  nodef(intensityStyles)
 #endif
 #if ISO_14755
+ def(iso14755,             35)
  def(iso14755_52,          32)
 #else
+ nodef(iso14755)
  nodef(iso14755_52)
 #endif
  def(console,              33)

diff --git a/src/rsinc.h b/src/rsinc.h
index 0667bf8d5e4269411cb595b76b8e2320a342b7f0..fa56424958b9dfd6b9e8247a9467d378111051e7 100644 (file)
--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -112,6 +112,7 @@
   def (perl_lib)
 #endif
 #if ISO_14755
+  def (iso14755)
   def (iso14755_52)
 #endif
 #ifdef HAVE_AFTERIMAGE

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 4717dd4899c9bc33c7498b19b11b4d4672b1f558..71884989830874ec4ab904021390e551b2a35e68 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -260,6 +260,7 @@ optList[] = {
               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, "iso14755", NULL, Opt_iso14755, 0, NULL),
               BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
 #endif
 #ifdef HAVE_AFTERIMAGE