compatibility function to provide XConvertCase() functionality from X11R6

Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>

        * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
        XConvertCase() functionality from X11R6 on X11R5 systems.

diff --git a/ChangeLog b/ChangeLog
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3882fc5a06806701253b97f3804dfaeb4cabd4b7..e9bc016d1ff2668712da64bc2305e737732f77dc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Jun 27 15:44:46 1998  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
+       XConvertCase() functionality from X11R6 on X11R5 systems.
+
 Thu Jun 25 10:50:34 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gdk/gdk.h gdk/gdkfont.c: Added functions gdk_text_height,

diff --git a/gdk/gdk.c b/gdk/gdk.c
index ab2604ed25efa270cf6943d8de87b2029dfb271b..6fcdd286c68baf673c438a85d3c0b5db8c981d9d 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -4343,6 +4343,136 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask,
   return result && (gdk_error_code != -1);
 }
 
+/* compatibility function from X11R6.3, since XConvertCase is not
+ * supplied by X11R5.
+ */
+static void
+gdkx_XConvertCase (KeySym symbol,
+                  KeySym *lower,
+                  KeySym *upper)
+{
+  register KeySym sym = symbol;
+
+  g_return_if_fail (lower != NULL);
+  g_return_if_fail (upper != NULL);
+
+  *lower = sym;
+  *upper = sym;
+
+  switch (sym >> 8)
+    {
+#if    defined (GDK_A) && defined (GDK_Ooblique)
+    case 0: /* Latin 1 */
+      if ((sym >= GDK_A) && (sym <= GDK_Z))
+       *lower += (GDK_a - GDK_A);
+      else if ((sym >= GDK_a) && (sym <= GDK_z))
+       *upper -= (GDK_a - GDK_A);
+      else if ((sym >= GDK_Agrave) && (sym <= GDK_Odiaeresis))
+       *lower += (GDK_agrave - GDK_Agrave);
+      else if ((sym >= GDK_agrave) && (sym <= GDK_odiaeresis))
+       *upper -= (GDK_agrave - GDK_Agrave);
+      else if ((sym >= GDK_Ooblique) && (sym <= GDK_Thorn))
+       *lower += (GDK_oslash - GDK_Ooblique);
+      else if ((sym >= GDK_oslash) && (sym <= GDK_thorn))
+       *upper -= (GDK_oslash - GDK_Ooblique);
+      break;
+#endif /* LATIN1 */
+      
+#if    defined (GDK_Aogonek) && defined (GDK_tcedilla)
+    case 1: /* Latin 2 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym == GDK_Aogonek)
+       *lower = GDK_aogonek;
+      else if (sym >= GDK_Lstroke && sym <= GDK_Sacute)
+       *lower += (GDK_lstroke - GDK_Lstroke);
+      else if (sym >= GDK_Scaron && sym <= GDK_Zacute)
+       *lower += (GDK_scaron - GDK_Scaron);
+      else if (sym >= GDK_Zcaron && sym <= GDK_Zabovedot)
+       *lower += (GDK_zcaron - GDK_Zcaron);
+      else if (sym == GDK_aogonek)
+       *upper = GDK_Aogonek;
+      else if (sym >= GDK_lstroke && sym <= GDK_sacute)
+       *upper -= (GDK_lstroke - GDK_Lstroke);
+      else if (sym >= GDK_scaron && sym <= GDK_zacute)
+       *upper -= (GDK_scaron - GDK_Scaron);
+      else if (sym >= GDK_zcaron && sym <= GDK_zabovedot)
+       *upper -= (GDK_zcaron - GDK_Zcaron);
+      else if (sym >= GDK_Racute && sym <= GDK_Tcedilla)
+       *lower += (GDK_racute - GDK_Racute);
+      else if (sym >= GDK_racute && sym <= GDK_tcedilla)
+       *upper -= (GDK_racute - GDK_Racute);
+      break;
+#endif /* LATIN2 */
+      
+#if    defined (GDK_Hstroke) && defined (GDK_Cabovedot)
+    case 2: /* Latin 3 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Hstroke && sym <= GDK_Hcircumflex)
+       *lower += (GDK_hstroke - GDK_Hstroke);
+      else if (sym >= GDK_Gbreve && sym <= GDK_Jcircumflex)
+       *lower += (GDK_gbreve - GDK_Gbreve);
+      else if (sym >= GDK_hstroke && sym <= GDK_hcircumflex)
+       *upper -= (GDK_hstroke - GDK_Hstroke);
+      else if (sym >= GDK_gbreve && sym <= GDK_jcircumflex)
+       *upper -= (GDK_gbreve - GDK_Gbreve);
+      else if (sym >= GDK_Cabovedot && sym <= GDK_Scircumflex)
+       *lower += (GDK_cabovedot - GDK_Cabovedot);
+      else if (sym >= GDK_cabovedot && sym <= GDK_scircumflex)
+       *upper -= (GDK_cabovedot - GDK_Cabovedot);
+      break;
+#endif /* LATIN3 */
+      
+#if    defined (GDK_Rcedilla) && defined (GDK_Amacron)
+    case 3: /* Latin 4 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Rcedilla && sym <= GDK_Tslash)
+       *lower += (GDK_rcedilla - GDK_Rcedilla);
+      else if (sym >= GDK_rcedilla && sym <= GDK_tslash)
+       *upper -= (GDK_rcedilla - GDK_Rcedilla);
+      else if (sym == GDK_ENG)
+       *lower = GDK_eng;
+      else if (sym == GDK_eng)
+       *upper = GDK_ENG;
+      else if (sym >= GDK_Amacron && sym <= GDK_Umacron)
+       *lower += (GDK_amacron - GDK_Amacron);
+      else if (sym >= GDK_amacron && sym <= GDK_umacron)
+       *upper -= (GDK_amacron - GDK_Amacron);
+      break;
+#endif /* LATIN4 */
+      
+#if    defined (GDK_Serbian_DJE) && defined (GDK_Cyrillic_yu)
+    case 6: /* Cyrillic */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Serbian_DJE && sym <= GDK_Serbian_DZE)
+       *lower -= (GDK_Serbian_DJE - GDK_Serbian_dje);
+      else if (sym >= GDK_Serbian_dje && sym <= GDK_Serbian_dze)
+       *upper += (GDK_Serbian_DJE - GDK_Serbian_dje);
+      else if (sym >= GDK_Cyrillic_YU && sym <= GDK_Cyrillic_HARDSIGN)
+       *lower -= (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
+      else if (sym >= GDK_Cyrillic_yu && sym <= GDK_Cyrillic_hardsign)
+       *upper += (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
+      break;
+#endif /* CYRILLIC */
+
+#if    defined (GDK_Greek_ALPHAaccent) && defined (GDK_Greek_finalsmallsigma)
+    case 7: /* Greek */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Greek_ALPHAaccent && sym <= GDK_Greek_OMEGAaccent)
+       *lower += (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
+      else if (sym >= GDK_Greek_alphaaccent && sym <= GDK_Greek_omegaaccent &&
+              sym != GDK_Greek_iotaaccentdieresis &&
+              sym != GDK_Greek_upsilonaccentdieresis)
+       *upper -= (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
+      else if (sym >= GDK_Greek_ALPHA && sym <= GDK_Greek_OMEGA)
+       *lower += (GDK_Greek_alpha - GDK_Greek_ALPHA);
+      else if (sym >= GDK_Greek_alpha && sym <= GDK_Greek_omega &&
+              sym != GDK_Greek_finalsmallsigma)
+       *upper -= (GDK_Greek_alpha - GDK_Greek_ALPHA);
+      break;
+#endif /* GREEK */
+    }
+}
+
 gchar*
 gdk_keyval_name (guint        keyval)
 {
@@ -4365,7 +4495,7 @@ gdk_keyval_to_upper (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return upper_val;
     }
   return 0;
@@ -4379,7 +4509,7 @@ gdk_keyval_to_lower (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return lower_val;
     }
   return 0;
@@ -4393,7 +4523,7 @@ gdk_keyval_is_upper (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return upper_val == keyval;
     }
   return TRUE;
@@ -4407,7 +4537,7 @@ gdk_keyval_is_lower (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return lower_val == keyval;
     }
   return TRUE;

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index ab2604ed25efa270cf6943d8de87b2029dfb271b..6fcdd286c68baf673c438a85d3c0b5db8c981d9d 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -4343,6 +4343,136 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask,
   return result && (gdk_error_code != -1);
 }
 
+/* compatibility function from X11R6.3, since XConvertCase is not
+ * supplied by X11R5.
+ */
+static void
+gdkx_XConvertCase (KeySym symbol,
+                  KeySym *lower,
+                  KeySym *upper)
+{
+  register KeySym sym = symbol;
+
+  g_return_if_fail (lower != NULL);
+  g_return_if_fail (upper != NULL);
+
+  *lower = sym;
+  *upper = sym;
+
+  switch (sym >> 8)
+    {
+#if    defined (GDK_A) && defined (GDK_Ooblique)
+    case 0: /* Latin 1 */
+      if ((sym >= GDK_A) && (sym <= GDK_Z))
+       *lower += (GDK_a - GDK_A);
+      else if ((sym >= GDK_a) && (sym <= GDK_z))
+       *upper -= (GDK_a - GDK_A);
+      else if ((sym >= GDK_Agrave) && (sym <= GDK_Odiaeresis))
+       *lower += (GDK_agrave - GDK_Agrave);
+      else if ((sym >= GDK_agrave) && (sym <= GDK_odiaeresis))
+       *upper -= (GDK_agrave - GDK_Agrave);
+      else if ((sym >= GDK_Ooblique) && (sym <= GDK_Thorn))
+       *lower += (GDK_oslash - GDK_Ooblique);
+      else if ((sym >= GDK_oslash) && (sym <= GDK_thorn))
+       *upper -= (GDK_oslash - GDK_Ooblique);
+      break;
+#endif /* LATIN1 */
+      
+#if    defined (GDK_Aogonek) && defined (GDK_tcedilla)
+    case 1: /* Latin 2 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym == GDK_Aogonek)
+       *lower = GDK_aogonek;
+      else if (sym >= GDK_Lstroke && sym <= GDK_Sacute)
+       *lower += (GDK_lstroke - GDK_Lstroke);
+      else if (sym >= GDK_Scaron && sym <= GDK_Zacute)
+       *lower += (GDK_scaron - GDK_Scaron);
+      else if (sym >= GDK_Zcaron && sym <= GDK_Zabovedot)
+       *lower += (GDK_zcaron - GDK_Zcaron);
+      else if (sym == GDK_aogonek)
+       *upper = GDK_Aogonek;
+      else if (sym >= GDK_lstroke && sym <= GDK_sacute)
+       *upper -= (GDK_lstroke - GDK_Lstroke);
+      else if (sym >= GDK_scaron && sym <= GDK_zacute)
+       *upper -= (GDK_scaron - GDK_Scaron);
+      else if (sym >= GDK_zcaron && sym <= GDK_zabovedot)
+       *upper -= (GDK_zcaron - GDK_Zcaron);
+      else if (sym >= GDK_Racute && sym <= GDK_Tcedilla)
+       *lower += (GDK_racute - GDK_Racute);
+      else if (sym >= GDK_racute && sym <= GDK_tcedilla)
+       *upper -= (GDK_racute - GDK_Racute);
+      break;
+#endif /* LATIN2 */
+      
+#if    defined (GDK_Hstroke) && defined (GDK_Cabovedot)
+    case 2: /* Latin 3 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Hstroke && sym <= GDK_Hcircumflex)
+       *lower += (GDK_hstroke - GDK_Hstroke);
+      else if (sym >= GDK_Gbreve && sym <= GDK_Jcircumflex)
+       *lower += (GDK_gbreve - GDK_Gbreve);
+      else if (sym >= GDK_hstroke && sym <= GDK_hcircumflex)
+       *upper -= (GDK_hstroke - GDK_Hstroke);
+      else if (sym >= GDK_gbreve && sym <= GDK_jcircumflex)
+       *upper -= (GDK_gbreve - GDK_Gbreve);
+      else if (sym >= GDK_Cabovedot && sym <= GDK_Scircumflex)
+       *lower += (GDK_cabovedot - GDK_Cabovedot);
+      else if (sym >= GDK_cabovedot && sym <= GDK_scircumflex)
+       *upper -= (GDK_cabovedot - GDK_Cabovedot);
+      break;
+#endif /* LATIN3 */
+      
+#if    defined (GDK_Rcedilla) && defined (GDK_Amacron)
+    case 3: /* Latin 4 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Rcedilla && sym <= GDK_Tslash)
+       *lower += (GDK_rcedilla - GDK_Rcedilla);
+      else if (sym >= GDK_rcedilla && sym <= GDK_tslash)
+       *upper -= (GDK_rcedilla - GDK_Rcedilla);
+      else if (sym == GDK_ENG)
+       *lower = GDK_eng;
+      else if (sym == GDK_eng)
+       *upper = GDK_ENG;
+      else if (sym >= GDK_Amacron && sym <= GDK_Umacron)
+       *lower += (GDK_amacron - GDK_Amacron);
+      else if (sym >= GDK_amacron && sym <= GDK_umacron)
+       *upper -= (GDK_amacron - GDK_Amacron);
+      break;
+#endif /* LATIN4 */
+      
+#if    defined (GDK_Serbian_DJE) && defined (GDK_Cyrillic_yu)
+    case 6: /* Cyrillic */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Serbian_DJE && sym <= GDK_Serbian_DZE)
+       *lower -= (GDK_Serbian_DJE - GDK_Serbian_dje);
+      else if (sym >= GDK_Serbian_dje && sym <= GDK_Serbian_dze)
+       *upper += (GDK_Serbian_DJE - GDK_Serbian_dje);
+      else if (sym >= GDK_Cyrillic_YU && sym <= GDK_Cyrillic_HARDSIGN)
+       *lower -= (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
+      else if (sym >= GDK_Cyrillic_yu && sym <= GDK_Cyrillic_hardsign)
+       *upper += (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
+      break;
+#endif /* CYRILLIC */
+
+#if    defined (GDK_Greek_ALPHAaccent) && defined (GDK_Greek_finalsmallsigma)
+    case 7: /* Greek */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (sym >= GDK_Greek_ALPHAaccent && sym <= GDK_Greek_OMEGAaccent)
+       *lower += (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
+      else if (sym >= GDK_Greek_alphaaccent && sym <= GDK_Greek_omegaaccent &&
+              sym != GDK_Greek_iotaaccentdieresis &&
+              sym != GDK_Greek_upsilonaccentdieresis)
+       *upper -= (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
+      else if (sym >= GDK_Greek_ALPHA && sym <= GDK_Greek_OMEGA)
+       *lower += (GDK_Greek_alpha - GDK_Greek_ALPHA);
+      else if (sym >= GDK_Greek_alpha && sym <= GDK_Greek_omega &&
+              sym != GDK_Greek_finalsmallsigma)
+       *upper -= (GDK_Greek_alpha - GDK_Greek_ALPHA);
+      break;
+#endif /* GREEK */
+    }
+}
+
 gchar*
 gdk_keyval_name (guint        keyval)
 {
@@ -4365,7 +4495,7 @@ gdk_keyval_to_upper (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return upper_val;
     }
   return 0;
@@ -4379,7 +4509,7 @@ gdk_keyval_to_lower (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return lower_val;
     }
   return 0;
@@ -4393,7 +4523,7 @@ gdk_keyval_is_upper (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return upper_val == keyval;
     }
   return TRUE;
@@ -4407,7 +4537,7 @@ gdk_keyval_is_lower (guint        keyval)
       KeySym lower_val = 0;
       KeySym upper_val = 0;
 
-      XConvertCase (keyval, &lower_val, &upper_val);
+      gdkx_XConvertCase (keyval, &lower_val, &upper_val);
       return lower_val == keyval;
     }
   return TRUE;