From 28c70890773facf7502dd0de4e7a9a2b70d9819f Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 28 Jun 1998 05:44:14 +0000 Subject: use native Xlib XConvertCase if it's available -Yosh --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ acconfig.h | 1 + config.h.in | 1 + configure.in | 8 +++++++- gdk/gdk.c | 17 +++++++++++++---- gdk/x11/gdkmain-x11.c | 17 +++++++++++++---- 12 files changed, 77 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9bc016d1..af2f165bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e9bc016d1..af2f165bb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jun 27 22:42:28 PDT 1998 Manish Singh + + * configure.in + * acconfig.h + * gdk/gdk.c: use native Xlib XConvertCase if it's available + Sat Jun 27 15:44:46 1998 Tim Janik * gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide diff --git a/acconfig.h b/acconfig.h index 0ccdca538..aa20a8a18 100644 --- a/acconfig.h +++ b/acconfig.h @@ -22,6 +22,7 @@ #undef HAVE_XSHM_H #undef HAVE_SHAPE_EXT #undef HAVE_SYS_SELECT_H +#undef HAVE_XCONVERTCASE /* some systems do not allow to ipcrm pages prior to * actual usage, namely: OSF1 V3.2, SunOS 4.1.1, 5.5, 5.5.1, 5.6, diff --git a/config.h.in b/config.h.in index d8bf68dbb..1c4ab3e3a 100644 --- a/config.h.in +++ b/config.h.in @@ -23,6 +23,7 @@ #undef HAVE_XSHM_H #undef HAVE_SHAPE_EXT #undef HAVE_SYS_SELECT_H +#undef HAVE_XCONVERTCASE /* some systems do not allow to ipcrm pages prior to * actual usage, namely: OSF1 V3.2, SunOS 4.1.1, 5.5, 5.5.1, 5.6, diff --git a/configure.in b/configure.in index 0f6df07a3..32ab98450 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,6 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) - # For automake. VERSION=$GTK_VERSION PACKAGE=gtk+ @@ -226,6 +225,13 @@ AC_CHECK_LIB(Xext, XShapeCombineMask, , $x_libs) +# Check for XConvertCase (X11R6 specific) + +AC_CHECK_LIB(X11, XConvertCase, + AC_DEFINE(HAVE_XCONVERTCASE), + , + $x_libs) + x_cflags="$X_CFLAGS" x_ldflags="$X_LDFLAGS $X_LIBS" diff --git a/gdk/gdk.c b/gdk/gdk.c index 6fcdd286c..603a77819 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -127,6 +127,13 @@ static GdkAtom gdk_dnd_check_types (GdkWindow *window, static void gdk_print_atom (GdkAtom anatom); #endif +#ifndef HAVE_XCONVERTCASE +static void gdkx_XConvertCase (KeySym symbol, + KeySym *lower, + KeySym *upper); +#define XConvertCase gdkx_XConvertCase +#endif + /* * old junk from offix, we might use it though so leave it */ @@ -4343,6 +4350,7 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask, return result && (gdk_error_code != -1); } +#ifndef HAVE_XCONVERTCASE /* compatibility function from X11R6.3, since XConvertCase is not * supplied by X11R5. */ @@ -4472,6 +4480,7 @@ gdkx_XConvertCase (KeySym symbol, #endif /* GREEK */ } } +#endif gchar* gdk_keyval_name (guint keyval) @@ -4495,7 +4504,7 @@ gdk_keyval_to_upper (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return upper_val; } return 0; @@ -4509,7 +4518,7 @@ gdk_keyval_to_lower (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return lower_val; } return 0; @@ -4523,7 +4532,7 @@ gdk_keyval_is_upper (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return upper_val == keyval; } return TRUE; @@ -4537,7 +4546,7 @@ gdk_keyval_is_lower (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + 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 6fcdd286c..603a77819 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -127,6 +127,13 @@ static GdkAtom gdk_dnd_check_types (GdkWindow *window, static void gdk_print_atom (GdkAtom anatom); #endif +#ifndef HAVE_XCONVERTCASE +static void gdkx_XConvertCase (KeySym symbol, + KeySym *lower, + KeySym *upper); +#define XConvertCase gdkx_XConvertCase +#endif + /* * old junk from offix, we might use it though so leave it */ @@ -4343,6 +4350,7 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask, return result && (gdk_error_code != -1); } +#ifndef HAVE_XCONVERTCASE /* compatibility function from X11R6.3, since XConvertCase is not * supplied by X11R5. */ @@ -4472,6 +4480,7 @@ gdkx_XConvertCase (KeySym symbol, #endif /* GREEK */ } } +#endif gchar* gdk_keyval_name (guint keyval) @@ -4495,7 +4504,7 @@ gdk_keyval_to_upper (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return upper_val; } return 0; @@ -4509,7 +4518,7 @@ gdk_keyval_to_lower (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return lower_val; } return 0; @@ -4523,7 +4532,7 @@ gdk_keyval_is_upper (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return upper_val == keyval; } return TRUE; @@ -4537,7 +4546,7 @@ gdk_keyval_is_lower (guint keyval) KeySym lower_val = 0; KeySym upper_val = 0; - gdkx_XConvertCase (keyval, &lower_val, &upper_val); + XConvertCase (keyval, &lower_val, &upper_val); return lower_val == keyval; } return TRUE; -- cgit v1.2.1