From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 17 Nov 2022 19:01:11 +0000 (-0500)
Subject: gdk: Clean up gdkprivate.h
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~93^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60aaf38f39fcc7a7feea84f1228ae91388bbb965;p=gtk4.git

gdk: Clean up gdkprivate.h

Move apis to more specific headers.
---

diff --git a/gdk/gdk.c b/gdk/gdk.c
index e6a1ebb51e..25e2d9af63 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -30,7 +30,7 @@
 
 #include "gdkconstructorprivate.h"
 #include "gdkdebugprivate.h"
-#include "gdkdisplay.h"
+#include "gdkdisplayprivate.h"
 #include "gdkglcontextprivate.h"
 #include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
diff --git a/gdk/gdkdebugprivate.h b/gdk/gdkdebugprivate.h
index 94cc26aa6e..d778414d58 100644
--- a/gdk/gdkdebugprivate.h
+++ b/gdk/gdkdebugprivate.h
@@ -15,8 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEBUG_H__
-#define __GDK_DEBUG_H__
+#ifndef __GDK_DEBUG_PRIVATE_H__
+#define __GDK_DEBUG_PRIVATE_H__
 
 #include <glib.h>
 
@@ -82,4 +82,16 @@ void             gdk_display_set_debug_flags    (GdkDisplay       *display,
 #define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
 #define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
 
-#endif
+typedef struct
+{
+  const char *key;
+  guint value;
+  const char *help;
+  gboolean always_enabled;
+} GdkDebugKey;
+
+guint gdk_parse_debug_var (const char        *variable,
+                           const GdkDebugKey *keys,
+                           guint              nkeys);
+
+#endif  /* __GDK_DEBUG_PRIVATE_H__ */
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 8a2be66155..bdc8ea3564 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -194,6 +194,10 @@ GdkAxisUse gdk_device_get_axis_use  (GdkDevice         *device,
 void gdk_device_set_timestamp (GdkDevice *device,
                                guint32    timestamp);
 
+gboolean gdk_device_grab_info (GdkDisplay  *display,
+                               GdkDevice   *device,
+                               GdkSurface  **grab_surface,
+                               gboolean    *owner_events);
 
 G_END_DECLS
 
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 7329120d76..df88bec6ac 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -258,6 +258,16 @@ void _gdk_windowing_got_event                (GdkDisplay       *display,
                                               GdkEvent         *event,
                                               gulong            serial);
 
+GdkDisplay *    gdk_display_open_default        (void);
+
+void gdk_display_set_double_click_time     (GdkDisplay   *display,
+                                            guint         msec);
+void gdk_display_set_double_click_distance (GdkDisplay   *display,
+                                            guint         distance);
+void gdk_display_set_cursor_theme          (GdkDisplay   *display,
+                                            const char   *theme,
+                                            int           size);
+
 G_END_DECLS
 
 #endif  /* __GDK_DISPLAY_PRIVATE_H__ */
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 3c125a9a2c..c2174875e6 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -5,24 +5,8 @@
 
 /* Private API for use in GTK+ */
 
-GdkDisplay *    gdk_display_open_default        (void);
-
-gboolean        gdk_device_grab_info            (GdkDisplay  *display,
-                                                 GdkDevice   *device,
-                                                 GdkSurface  **grab_surface,
-                                                 gboolean    *owner_events);
-
 void            gdk_pre_parse                   (void);
 
-gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
-
-void gdk_display_set_double_click_time     (GdkDisplay   *display,
-                                            guint         msec);
-void gdk_display_set_double_click_distance (GdkDisplay   *display,
-                                            guint         distance);
-void gdk_display_set_cursor_theme          (GdkDisplay   *display,
-                                            const char   *theme,
-                                            int           size);
 gboolean gdk_running_in_sandbox (void);
 gboolean gdk_should_use_portal (void);
 
@@ -32,18 +16,6 @@ PangoDirection gdk_unichar_direction (gunichar    ch) G_GNUC_CONST;
 PangoDirection gdk_find_base_dir     (const char *text,
                                       int         len);
 
-typedef struct
-{
-  const char *key;
-  guint value;
-  const char *help;
-  gboolean always_enabled;
-} GdkDebugKey;
-
-guint gdk_parse_debug_var (const char        *variable,
-                           const GdkDebugKey *keys,
-                           guint              nkeys);
-
 /* Backward compatibility shim, to avoid bumping up the minimum
  * required version of GLib; most of our uses of g_memdup() are
  * safe, and those that aren't have been fixed
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index a4e0e751ab..f57bccdf97 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -344,6 +344,9 @@ void       gdk_surface_request_compute_size (GdkSurface      *surface);
 GDK_AVAILABLE_IN_ALL
 void           gdk_surface_request_motion (GdkSurface *surface);
 
+gboolean       gdk_surface_supports_edge_constraints    (GdkSurface *surface);
+
+
 
 G_END_DECLS
 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 95e6d3f59a..48bcb136fb 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include "gdk/gdkdisplayprivate.h"
 #include "gdk/gdkprofilerprivate.h"
+#include "gdk/gdkdebugprivate.h"
 #include "gsk/gskprivate.h"
 #include "gsk/gskrendernodeprivate.h"
 #include "gtknative.h"
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index c7e7e0c96f..a547f9a086 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -29,7 +29,7 @@
 #include "gtkversion.h"
 #include "gtkwidgetprivate.h"
 
-#include "gdk/gdkprivate.h"
+#include "gdk/gdkdisplayprivate.h"
 
 #include <string.h>