callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop support for pre-R6 X

Browse Source 
X11 R6 was released in 1995 - time to let go.
This commit is contained in:
Matthias Clasen 2012-03-10 23:27:21 -05:00
parent f8fccae852
commit de62a1096b
9 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -989,24 +989,6 @@ if test "x$enable_x11_backend" = xyes; then
[AC_MSG_RESULT([unknown]) [AC_MSG_RESULT([unknown])
AC_MSG_ERROR([xReply type unavailable. X11 is too old])])]) AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
# Check for XConvertCase, XInternAtoms (X11R6 specific)
AC_CHECK_FUNCS(XConvertCase XInternAtoms)
# Generic X11R6 check needed for XIM support; we could
# probably use this to replace the above, but we'll
# leave the separate checks for XConvertCase and XInternAtoms
# for clarity
have_x11r6=false
AC_CHECK_FUNC(XAddConnectionWatch,
have_x11r6=true)
if $have_x11r6; then
AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
fi
AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
# Check for XKB support. # Check for XKB support.
if test "x$enable_xkb" = "xyes"; then if test "x$enable_xkb" = "xyes"; then
@ -1219,7 +1201,6 @@ else
XPACKAGES= XPACKAGES=
AM_CONDITIONAL(USE_X11, false) AM_CONDITIONAL(USE_X11, false)
AM_CONDITIONAL(HAVE_X11R6, false)
fi fi
# Check for Pango flags # Check for Pango flags

6
gdk/x11/gdkdisplay-x11.c
View File

@ -96,13 +96,11 @@ static gboolean gdk_x11_display_translate_event (GdkEventTranslator *translator,
GdkEvent *event, GdkEvent *event,
XEvent *xevent); XEvent *xevent);
#ifdef HAVE_X11R6
static void gdk_internal_connection_watch (Display *display, static void gdk_internal_connection_watch (Display *display,
XPointer arg, XPointer arg,
gint fd, gint fd,
gboolean opening, gboolean opening,
XPointer *watch_data); XPointer *watch_data);
#endif /* HAVE_X11R6 */
typedef struct _GdkEventTypeX11 GdkEventTypeX11; typedef struct _GdkEventTypeX11 GdkEventTypeX11;
@ -1231,10 +1229,8 @@ _gdk_x11_display_open (const gchar *display_name)
display_x11->xdisplay = xdisplay; display_x11->xdisplay = xdisplay;
#ifdef HAVE_X11R6
/* Set up handlers for Xlib internal connections */ /* Set up handlers for Xlib internal connections */
XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL); XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL);
#endif /* HAVE_X11R6 */
_gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms)); _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms));
@ -1469,7 +1465,6 @@ _gdk_x11_display_open (const gchar *display_name)
return display; return display;
} }
#ifdef HAVE_X11R6
/* /*
* XLib internal connection handling * XLib internal connection handling
*/ */
@ -1548,7 +1543,6 @@ gdk_internal_connection_watch (Display *display,
else else
gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data); gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
} }
#endif /* HAVE_X11R6 */
static const gchar * static const gchar *
gdk_x11_display_get_name (GdkDisplay *display) gdk_x11_display_get_name (GdkDisplay *display)

2
gdk/x11/gdkdisplaymanager-x11.c
View File

@ -108,9 +108,7 @@ gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name; manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval; manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
manager_class->get_keyval_name = _gdk_x11_display_manager_get_keyval_name; manager_class->get_keyval_name = _gdk_x11_display_manager_get_keyval_name;
#ifdef HAVE_XCONVERTCASE
manager_class->keyval_convert_case = _gdk_x11_display_manager_keyval_convert_case; manager_class->keyval_convert_case = _gdk_x11_display_manager_keyval_convert_case;
#endif
} }
void void

2
gdk/x11/gdkkeys-x11.c
View File

@ -1401,7 +1401,6 @@ _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
return XStringToKeysym (keyval_name); return XStringToKeysym (keyval_name);
} }
#ifdef HAVE_XCONVERTCASE
void void
_gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager, _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
guint symbol, guint symbol,
@ -1429,7 +1428,6 @@ _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
if (upper) if (upper)
*upper = xupper; *upper = xupper;
} }
#endif /* HAVE_XCONVERTCASE */
gint gint
_gdk_x11_get_group_for_state (GdkDisplay *display, _gdk_x11_get_group_for_state (GdkDisplay *display,

7
gdk/x11/gdkmain-x11.c
View File

@ -98,13 +98,6 @@ static int _gdk_error_handler_push_count = 0;
* Private function declarations * Private function declarations
*/ */
#ifndef HAVE_XCONVERTCASE
static void gdkx_XConvertCase (KeySym symbol,
KeySym *lower,
KeySym *upper);
#define XConvertCase gdkx_XConvertCase
#endif
static int gdk_x_error (Display *display, static int gdk_x_error (Display *display,
XErrorEvent *error); XErrorEvent *error);
static int gdk_x_io_error (Display *display); static int gdk_x_io_error (Display *display);

2
gdk/x11/gdkprivate-x11.h
View File

@ -266,12 +266,10 @@ guint _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
const gchar *name); const gchar *name);
gchar * _gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager, gchar * _gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
guint keyval); guint keyval);
#ifdef HAVE_XCONVERTCASE
void _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager, void _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
guint symbol, guint symbol,
guint *lower, guint *lower,
guint *upper); guint *upper);
#endif
GdkCursor *_gdk_x11_display_get_cursor_for_type (GdkDisplay *display, GdkCursor *_gdk_x11_display_get_cursor_for_type (GdkDisplay *display,
GdkCursorType type); GdkCursorType type);

8
gdk/x11/gdkproperty-x11.c
View File

@ -276,16 +276,8 @@ _gdk_x11_precache_atoms (GdkDisplay *display,
} }
if (n_xatoms) if (n_xatoms)
{
#ifdef HAVE_XINTERNATOMS
XInternAtoms (GDK_DISPLAY_XDISPLAY (display), XInternAtoms (GDK_DISPLAY_XDISPLAY (display),
(char **)xatom_names, n_xatoms, False, xatoms); (char **)xatom_names, n_xatoms, False, xatoms);
#else
for (i = 0; i < n_xatoms; i++)
xatoms[i] = XInternAtom (GDK_DISPLAY_XDISPLAY (display),
xatom_names[i], False);
#endif
}
for (i = 0; i < n_xatoms; i++) for (i = 0; i < n_xatoms; i++)
insert_atom_pair (display, atoms[i], xatoms[i]); insert_atom_pair (display, atoms[i], xatoms[i]);

7
gdk/x11/xsettings-client.c
View File

@ -496,7 +496,6 @@ xsettings_client_new_with_grab_funcs (Display *display,
client->cb_data = cb_data; client->cb_data = cb_data;
client->grab = grab; client->grab = grab;
client->ungrab = ungrab; client->ungrab = ungrab;
client->manager_window = None; client->manager_window = None;
client->settings = NULL; client->settings = NULL;
@ -505,13 +504,7 @@ xsettings_client_new_with_grab_funcs (Display *display,
atom_names[1] = "_XSETTINGS_SETTINGS"; atom_names[1] = "_XSETTINGS_SETTINGS";
atom_names[2] = "MANAGER"; atom_names[2] = "MANAGER";
#ifdef HAVE_XINTERNATOMS
XInternAtoms (display, atom_names, 3, False, atoms); XInternAtoms (display, atom_names, 3, False, atoms);
#else
atoms[0] = XInternAtom (display, atom_names[0], False);
atoms[1] = XInternAtom (display, atom_names[1], False);
atoms[2] = XInternAtom (display, atom_names[2], False);
#endif
client->selection_atom = atoms[0]; client->selection_atom = atoms[0];
client->xsettings_atom = atoms[1]; client->xsettings_atom = atoms[1];

2
modules/input/Makefile.am
View File

@ -30,13 +30,11 @@ im_xim_la_SOURCES = \
imxim.c imxim.c
libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES) libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES)
im_xim_la_LIBADD = $(LDADDS) im_xim_la_LIBADD = $(LDADDS)
if HAVE_X11R6
if INCLUDE_IM_XIM if INCLUDE_IM_XIM
STATIC_XIM_MODULE = libstatic-im-xim.la STATIC_XIM_MODULE = libstatic-im-xim.la
else else
XIM_MODULE=im-xim.la XIM_MODULE=im-xim.la
endif endif
endif
im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_am_et_la_SOURCES = imam-et.c im_am_et_la_SOURCES = imam-et.c