[gtk+] x11: Drop GdkX11Visual as public api

[Matthias Clasen <matthiasc src gnome org>]

commit 71c463ae8548fa6c32aec43158f447430fc26af6
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 17 13:03:11 2017 -0500

    x11: Drop GdkX11Visual as public api
    
    There was no useful functionality left here,
    so just remove this from the api altogether.

 gdk/x11/gdkglcontext-x11.c  |    1 -
 gdk/x11/gdkglcontext-x11.h  |    2 +-
 gdk/x11/gdkscreen-x11.h     |    2 +-
 gdk/x11/gdkvisual-x11.h     |   37 +++++++++++++++++++++
 gdk/x11/gdkx-autocleanups.h |    1 -
 gdk/x11/gdkx.h              |    1 -
 gdk/x11/gdkx11visual.h      |   74 -------------------------------------------
 7 files changed, 39 insertions(+), 79 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 871c812..74911dd 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -29,7 +29,6 @@
 #include "gdkx11glcontext.h"
 #include "gdkx11screen.h"
 #include "gdkx11window.h"
-#include "gdkx11visual.h"
 #include "gdkvisual-x11.h"
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index af5ea65..f5af211 100644
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -29,7 +29,7 @@
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkx11visual.h"
+#include "gdkvisual-x11.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 4820526..0b14d31 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -23,7 +23,7 @@
 #define __GDK_X11_SCREEN__
 
 #include "gdkx11screen.h"
-#include "gdkx11visual.h"
+#include "gdkvisual-x11.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
diff --git a/gdk/x11/gdkvisual-x11.h b/gdk/x11/gdkvisual-x11.h
index 807c577..9b3bdd5 100644
--- a/gdk/x11/gdkvisual-x11.h
+++ b/gdk/x11/gdkvisual-x11.h
@@ -18,6 +18,34 @@
 
 G_BEGIN_DECLS
 
+#include <gdk/gdk.h>
+#include <gdk/x11/gdkx11screen.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_X11_VISUAL              (gdk_x11_visual_get_type ())
+#define GDK_X11_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_VISUAL, 
GdkX11Visual))
+#define GDK_X11_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_VISUAL, 
GdkX11VisualClass))
+#define GDK_IS_X11_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_VISUAL))
+#define GDK_IS_X11_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_VISUAL))
+#define GDK_X11_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_VISUAL, 
GdkX11VisualClass))
+
+typedef struct _GdkX11Visual GdkX11Visual;
+typedef struct _GdkX11VisualClass GdkX11VisualClass;
+
+typedef enum
+{
+  GDK_VISUAL_STATIC_GRAY,
+  GDK_VISUAL_GRAYSCALE,
+  GDK_VISUAL_STATIC_COLOR,
+  GDK_VISUAL_PSEUDO_COLOR,
+  GDK_VISUAL_TRUE_COLOR,
+  GDK_VISUAL_DIRECT_COLOR
+} GdkVisualType;
+
 struct _GdkX11Visual
 {
   GObject parent_instance;
@@ -35,6 +63,15 @@ struct _GdkX11Visual
   Visual *xvisual;
 };
 
+GType    gdk_x11_visual_get_type          (void);
+
+Visual * gdk_x11_visual_get_xvisual       (GdkX11Visual *visual);
+
+#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
+
+GdkX11Visual* gdk_x11_screen_lookup_visual (GdkX11Screen *screen,
+                                            VisualID      xvisualid);
+
 G_END_DECLS
 
 #endif
diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index 90b47dc..d18abfa 100644
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -31,7 +31,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Window, g_object_unref)
 
 #endif
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 87960fd..153b4a5 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -48,7 +48,6 @@
 #include <gdk/x11/gdkx11screen.h>
 #include <gdk/x11/gdkx11selection.h>
 #include <gdk/x11/gdkx11utils.h>
-#include <gdk/x11/gdkx11visual.h>
 #include <gdk/x11/gdkx11window.h>
 
 #include <gdk/x11/gdkx-autocleanups.h>