Drop support for pre-R6 X

X11 R6 was released in 1995 - time to let go.

diff --git a/configure.ac b/configure.ac
index 2d351b015391cf746bee313de98ee2f4350c112b..2be9ae20f2a19e5be2640310b45785a8a4a5e601 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -989,24 +989,6 @@ if test "x$enable_x11_backend" = xyes; then
                                        [AC_MSG_RESULT([unknown])
                                         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.
 
   if test "x$enable_xkb" = "xyes"; then
@@ -1219,7 +1201,6 @@ else
   XPACKAGES=
 
   AM_CONDITIONAL(USE_X11, false)
-  AM_CONDITIONAL(HAVE_X11R6, false)
 fi
 
 # Check for Pango flags

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 1017975672672c435bd1edbf0bf2f445e2d92367..fe3784a3e35ed30b985bffa3929c5db7d565fe3b 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -96,13 +96,11 @@ static gboolean gdk_x11_display_translate_event (GdkEventTranslator *translator,
                                                  GdkEvent           *event,
                                                  XEvent             *xevent);
 
-#ifdef HAVE_X11R6
 static void gdk_internal_connection_watch (Display  *display,
                                           XPointer  arg,
                                           gint      fd,
                                           gboolean  opening,
                                           XPointer *watch_data);
-#endif /* HAVE_X11R6 */
 
 typedef struct _GdkEventTypeX11 GdkEventTypeX11;
 
@@ -1225,17 +1223,15 @@ _gdk_x11_display_open (const gchar *display_name)
   xdisplay = XOpenDisplay (display_name);
   if (!xdisplay)
     return NULL;
-  
+
   display = g_object_new (GDK_TYPE_X11_DISPLAY, NULL);
   display_x11 = GDK_X11_DISPLAY (display);
 
   display_x11->xdisplay = xdisplay;
 
-#ifdef HAVE_X11R6  
   /* Set up handlers for Xlib internal connections */
   XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL);
-#endif /* HAVE_X11R6 */
-  
+
   _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms));
 
   /* RandR must be initialized before we initialize the screens */
@@ -1469,7 +1465,6 @@ _gdk_x11_display_open (const gchar *display_name)
   return display;
 }
 
-#ifdef HAVE_X11R6
 /*
  * XLib internal connection handling
  */
@@ -1548,7 +1543,6 @@ gdk_internal_connection_watch (Display  *display,
   else
     gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
 }
-#endif /* HAVE_X11R6 */
 
 static const gchar *
 gdk_x11_display_get_name (GdkDisplay *display)

diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index 74941af675db2201ae22c45a66a05e86900e04b7..46254a23aa1e6c09fe73014b61ea1f1a79b68e18 100644 (file)
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -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->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
   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;
-#endif
 }
 
 void

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index c5153bdcc2a668d5fc2359508e8f8119b91f0d1b..0ce16ad324558053ed234ea71db5c13614900511 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1401,7 +1401,6 @@ _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
   return XStringToKeysym (keyval_name);
 }
 
-#ifdef HAVE_XCONVERTCASE
 void
 _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
                                               guint              symbol,
@@ -1429,7 +1428,6 @@ _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
   if (upper)
     *upper = xupper;
 }
-#endif /* HAVE_XCONVERTCASE */
 
 gint
 _gdk_x11_get_group_for_state (GdkDisplay      *display,

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index ede6d1381e55121c630c3611aee5fce2bfd84d83..5065f9c5ccac7f0e91ae255b3726d04121a0432d 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -98,13 +98,6 @@ static int _gdk_error_handler_push_count = 0;
  * 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, 
                                                  XErrorEvent *error);
 static int         gdk_x_io_error               (Display     *display);

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index d17d4fd3dfa281e103827376eee030abb743e558..b5f68b2645977b6f9eb3ec6dddfb2e822fb173e2 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -266,12 +266,10 @@ guint   _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
                                                 const gchar       *name);
 gchar * _gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
                                                   guint              keyval);
-#ifdef HAVE_XCONVERTCASE
 void    _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
                                                       guint              symbol,
                                                       guint             *lower,
                                                       guint             *upper);
-#endif
 
 GdkCursor *_gdk_x11_display_get_cursor_for_type     (GdkDisplay    *display,
                                                      GdkCursorType  type);

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 1c89e5546bc59987c77280b2017337acba98e668..3d843d2b499090916e1d3097e38dd4dcfe9429db 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -276,16 +276,8 @@ _gdk_x11_precache_atoms (GdkDisplay          *display,
     }
 
   if (n_xatoms)
-    {
-#ifdef HAVE_XINTERNATOMS
-      XInternAtoms (GDK_DISPLAY_XDISPLAY (display),
-                   (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
-    }
+    XInternAtoms (GDK_DISPLAY_XDISPLAY (display),
+                  (char **)xatom_names, n_xatoms, False, xatoms);
 
   for (i = 0; i < n_xatoms; i++)
     insert_atom_pair (display, atoms[i], xatoms[i]);

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 67e3b6b02056e6a1b66b45dba53d6cb994969f63..103843d8e2050b4505328ea60d55174f8318d360 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -496,7 +496,6 @@ xsettings_client_new_with_grab_funcs (Display             *display,
   client->cb_data = cb_data;
   client->grab = grab;
   client->ungrab = ungrab;
-  
   client->manager_window = None;
   client->settings = NULL;
 
@@ -505,14 +504,8 @@ xsettings_client_new_with_grab_funcs (Display             *display,
   atom_names[1] = "_XSETTINGS_SETTINGS";
   atom_names[2] = "MANAGER";
 
-#ifdef HAVE_XINTERNATOMS
   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->xsettings_atom = atoms[1];
   client->manager_atom = atoms[2];

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index b847a19082bf4d8a2e9a6ef06fd6652b8b84d71b..da989eb4ba6bf47cd8383aed47b9dbcb638db1bf 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -30,13 +30,11 @@ im_xim_la_SOURCES =                 \
        imxim.c
 libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES)
 im_xim_la_LIBADD = $(LDADDS)
-if HAVE_X11R6
 if INCLUDE_IM_XIM
 STATIC_XIM_MODULE = libstatic-im-xim.la
 else
 XIM_MODULE=im-xim.la
 endif
-endif
 
 im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_am_et_la_SOURCES = imam-et.c