forked from AuroraMiddleware/gtk
use native Xlib XConvertCase if it's available
-Yosh
This commit is contained in:
parent
f93afa9c75
commit
28c7089077
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -1,3 +1,9 @@
|
||||
Sat Jun 27 22:42:28 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/gdk.c: use native Xlib XConvertCase if it's available
|
||||
|
||||
Sat Jun 27 15:44:46 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gdk/gdk.c (gdkx_XConvertCase): compatibility function to provide
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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"
|
||||
|
||||
|
17
gdk/gdk.c
17
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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user