Merge branch 'private-x11-types' into 'master'

Do not parse all GDK-X11 source files

See merge request GNOME/gtk!1646

gdk/x11/gdkdevicemanager-xi2.c

@@ -19,12 +19,12 @@
 
 #include "gdkx11devicemanager-xi2.h"
 #include "gdkx11device-xi2.h"
-#include "gdkx11keys.h"
 
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetoolprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkeventtranslator.h"
+#include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkintl.h"

gdk/x11/gdkdisplay-x11.c

@@ -26,7 +26,6 @@
 
 #include "gdkdisplay-x11.h"
 #include "gdkdisplayprivate.h"
-#include "gdkx11keys.h"
 
 #include "gdkasync.h"
 #include "gdkdisplay.h"
@@ -39,12 +38,15 @@
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
 #include "xsettings-client.h"
+
+#include "gdkcairocontext-x11.h"
 #include "gdkclipboard-x11.h"
+#include "gdkglcontext-x11.h"
+#include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
-#include "gdkcairocontext-x11.h"
-#include "gdkglcontext-x11.h"
 #include "gdkvulkancontext-x11.h"
+
 #include "gdk-private.h"
 
 #include <glib.h>

gdk/x11/gdkkeys-x11.c

@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include "gdkx11keys.h"
+#include "gdkkeys-x11.h"
+
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"

gdk/x11/gdkkeys-x11.h

@@ -18,10 +18,6 @@
 #ifndef __GDK_X11_KEYS_H__
 #define __GDK_X11_KEYS_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/x11/gdkx.h> can be included directly."
-#endif
-
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysprivate.h>
 
@@ -41,7 +37,6 @@ typedef struct _GdkX11KeymapClass GdkX11KeymapClass;
 #define GDK_IS_X11_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_KEYMAP))
 #define GDK_X11_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_KEYMAP, GdkX11KeymapClass))
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_x11_keymap_get_type (void);
 
 gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,

gdk/x11/meson.build

@@ -1,36 +1,44 @@
+# A list of sources that contain public API; these are the sources that
+# will be introspected for the GdkX11 namespace.
+#
 # Note: gdksettings.c gets included from xsettings-client.c, do not add here
-gdk_x11_sources = files([
-  'gdkapplaunchcontext-x11.c',
-  'gdkasync.c',
-  'gdkcairocontext-x11.c',
-  'gdkclipboard-x11.c',
+gdk_x11_public_sources = files([
   'gdkcursor-x11.c',
   'gdkdevice-xi2.c',
   'gdkdevicemanager-x11.c',
   'gdkdevicemanager-xi2.c',
   'gdkdisplay-x11.c',
-  'gdkdrag-x11.c',
-  'gdkdrop-x11.c',
-  'gdkeventsource.c',
-  'gdkeventtranslator.c',
   'gdkglcontext-x11.c',
   'gdkkeys-x11.c',
-  'gdkmain-x11.c',
   'gdkmonitor-x11.c',
   'gdkproperty-x11.c',
   'gdkscreen-x11.c',
   'gdkselection-x11.c',
-  'gdkselectioninputstream-x11.c',
-  'gdkselectionoutputstream-x11.c',
-  'gdktextlistconverter-x11.c',
   'gdkvisual-x11.c',
-  'gdkvulkancontext-x11.c',
   'gdksurface-x11.c',
-  'gdkxftdefaults.c',
   'gdkxid.c',
   'xsettings-client.c',
 ])
 
+# All sources
+gdk_x11_sources = gdk_x11_public_sources + [
+  'gdkapplaunchcontext-x11.c',
+  'gdkasync.c',
+  'gdkcairocontext-x11.c',
+  'gdkclipboard-x11.c',
+  'gdkdrag-x11.c',
+  'gdkdrop-x11.c',
+  'gdkeventsource.c',
+  'gdkeventtranslator.c',
+  'gdkmain-x11.c',
+  'gdkselectioninputstream-x11.c',
+  'gdkselectionoutputstream-x11.c',
+  'gdktextlistconverter-x11.c',
+  'gdkvulkancontext-x11.c',
+  'gdkxftdefaults.c',
+]
+
+# Public headers; will be installed and introspected
 gdk_x11_public_headers = files([
   'gdkx-autocleanups.h',
   'gdkx11applaunchcontext.h',

gtk/meson.build

@@ -1044,7 +1044,7 @@ if build_gir
 
   if x11_enabled
     gdk_x11_gir = gnome.generate_gir(libgtk,
-                                     sources: gdk_x11_public_headers + gdk_x11_sources,
+                                     sources: gdk_x11_public_headers + gdk_x11_public_sources,
                                      namespace: 'GdkX11',
                                      nsversion: gtk_api_version,
                                      identifier_prefix: 'Gdk',