gdk: Clean up gdkprivate.h

Move apis to more specific headers.
This commit is contained in:
Matthias Clasen 2022-11-17 14:01:11 -05:00
parent 2bab8cca5f
commit 60aaf38f39
8 changed files with 36 additions and 34 deletions

View File

@ -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"

View File

@ -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__ */

View File

@ -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

View File

@ -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__ */

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -29,7 +29,7 @@
#include "gtkversion.h"
#include "gtkwidgetprivate.h"
#include "gdk/gdkprivate.h"
#include "gdk/gdkdisplayprivate.h"
#include <string.h>