diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-03-15 05:58:39 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-05-05 15:38:46 -0400 |
| commit | ca81028901de2ae5c73ab1c4216182bdfe817c92 (patch) | |
| tree | 6bf959b02ab661c328bbbb638726f785ee675746 | |
| parent | 96d1a1e9c5251b6a44f8a83fbdd60b7bd88f12a4 (diff) | |
| download | gtk+-ca81028901de2ae5c73ab1c4216182bdfe817c92.tar.gz | |
Add GDK_AVAILABLE_IN_ALL annotations in gdk
This is in preparation to modernizing our handing
of exported symbols.
70 files changed, 593 insertions, 3 deletions
diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h index 94fd011ce4..88d451a54a 100644 --- a/gdk/broadway/gdkbroadwaycursor.h +++ b/gdk/broadway/gdkbroadwaycursor.h @@ -47,6 +47,7 @@ typedef GdkCursor GdkBroadwayCursor; #endif typedef struct _GdkBroadwayCursorClass GdkBroadwayCursorClass; +GDK_AVAILABLE_IN_ALL GType gdk_broadway_cursor_get_type (void); G_END_DECLS diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h new file mode 100644 index 0000000000..0818af293d --- /dev/null +++ b/gdk/broadway/gdkbroadwaydisplaymanager.h @@ -0,0 +1,46 @@ +/* gdkbroadwaydisplaymanager.h + * + * Copyright (C) 2005-2007 Imendio AB + * Copyright 2010 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__ +#define __GDK_BROADWAY_DISPLAY_MANAGER_H__ + +#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) +#error "Only <gdk/gdkbroadway.h> can be included directly." +#endif + +#include <gdk/gdk.h> + +G_BEGIN_DECLS + +#define GDK_TYPE_BROADWAY_DISPLAY_MANAGER (gdk_broadway_display_manager_get_type ()) +#define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager)) + +#ifdef GDK_COMPILATION +typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager; +#else +typedef GdkDisplayManager _GdkBroadwayDisplayManager; +#endif +typedef struct _GdkDisplayManagerClass GdkBroadwayDisplayManagerClass; + +GDK_AVAILABLE_IN_ALL +GType gdk_broadway_display_manager_get_type (void); + +G_END_DECLS + +#endif /* __GDK_BROADWAY_DISPLAY_MANAGER_H__ */ diff --git a/gdk/broadway/gdkbroadwayvisual.h b/gdk/broadway/gdkbroadwayvisual.h index 2b69f3ad94..c4ccfa5ae4 100644 --- a/gdk/broadway/gdkbroadwayvisual.h +++ b/gdk/broadway/gdkbroadwayvisual.h @@ -38,6 +38,7 @@ typedef GdkVisual GdkBroadwayVisual; typedef struct _GdkBroadwayVisualClass GdkBroadwayVisualClass; +GDK_AVAILABLE_IN_ALL GType gdk_broadway_visual_get_type (void); G_END_DECLS diff --git a/gdk/broadway/gdkbroadwaywindow.h b/gdk/broadway/gdkbroadwaywindow.h index 4fc574a1d9..914ec278e6 100644 --- a/gdk/broadway/gdkbroadwaywindow.h +++ b/gdk/broadway/gdkbroadwaywindow.h @@ -43,8 +43,10 @@ typedef GdkWindow GdkBroadwayWindow; #endif typedef struct _GdkBroadwayWindowClass GdkBroadwayWindowClass; +GDK_AVAILABLE_IN_ALL GType gdk_broadway_window_get_type (void); +GDK_AVAILABLE_IN_ALL guint32 gdk_broadway_get_last_seen_time (GdkWindow *window); G_END_DECLS @@ -26,6 +26,7 @@ #define GDK_DISABLE_DEPRECATION_WARNINGS 1 +#include "gdkversionmacros.h" #include "gdkmain.h" #include "gdkinternals.h" diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h index af141dca6c..dfcd5d4bfe 100644 --- a/gdk/gdkapplaunchcontext.h +++ b/gdk/gdkapplaunchcontext.h @@ -37,6 +37,7 @@ G_BEGIN_DECLS #define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT)) +GDK_AVAILABLE_IN_ALL GType gdk_app_launch_context_get_type (void); GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context) @@ -44,14 +45,19 @@ GdkAppLaunchContext *gdk_app_launch_context_new (void); GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context) void gdk_app_launch_context_set_display (GdkAppLaunchContext *context, GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_screen (GdkAppLaunchContext *context, GdkScreen *screen); +GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context, gint desktop); +GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context, guint32 timestamp); +GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_icon (GdkAppLaunchContext *context, GIcon *icon); +GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context, const char *icon_name); diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index 5d72f3fac6..9cb601dc71 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -30,26 +30,34 @@ G_BEGIN_DECLS +GDK_AVAILABLE_IN_ALL cairo_t * gdk_cairo_create (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_cairo_get_clip_rectangle (cairo_t *cr, GdkRectangle *rect); +GDK_AVAILABLE_IN_ALL void gdk_cairo_set_source_rgba (cairo_t *cr, const GdkRGBA *rgba); +GDK_AVAILABLE_IN_ALL void gdk_cairo_set_source_pixbuf (cairo_t *cr, const GdkPixbuf *pixbuf, gdouble pixbuf_x, gdouble pixbuf_y); +GDK_AVAILABLE_IN_ALL void gdk_cairo_set_source_window (cairo_t *cr, GdkWindow *window, gdouble x, gdouble y); +GDK_AVAILABLE_IN_ALL void gdk_cairo_rectangle (cairo_t *cr, const GdkRectangle *rectangle); +GDK_AVAILABLE_IN_ALL void gdk_cairo_region (cairo_t *cr, const cairo_region_t *region); +GDK_AVAILABLE_IN_ALL cairo_region_t * gdk_cairo_region_create_from_surface (cairo_surface_t *surface); diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h index 74310f3716..08f0270db7 100644 --- a/gdk/gdkcolor.h +++ b/gdk/gdkcolor.h @@ -31,6 +31,7 @@ #include <cairo.h> #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS @@ -58,17 +59,24 @@ struct _GdkColor #define GDK_TYPE_COLOR (gdk_color_get_type ()) +GDK_AVAILABLE_IN_ALL GType gdk_color_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkColor *gdk_color_copy (const GdkColor *color); +GDK_AVAILABLE_IN_ALL void gdk_color_free (GdkColor *color); +GDK_AVAILABLE_IN_ALL guint gdk_color_hash (const GdkColor *color); +GDK_AVAILABLE_IN_ALL gboolean gdk_color_equal (const GdkColor *colora, const GdkColor *colorb); +GDK_AVAILABLE_IN_ALL gboolean gdk_color_parse (const gchar *spec, GdkColor *color); +GDK_AVAILABLE_IN_ALL gchar * gdk_color_to_string (const GdkColor *color); diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index 16e965b9c9..c526101975 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -213,25 +213,33 @@ typedef enum /* Cursors */ +GDK_AVAILABLE_IN_ALL GType gdk_cursor_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_for_display (GdkDisplay *display, GdkCursorType cursor_type); #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new (GdkCursorType cursor_type); #endif +GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_from_pixbuf (GdkDisplay *display, GdkPixbuf *pixbuf, gint x, gint y); +GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_from_name (GdkDisplay *display, const gchar *name); +GDK_AVAILABLE_IN_ALL GdkDisplay* gdk_cursor_get_display (GdkCursor *cursor); GDK_DEPRECATED_IN_3_0_FOR(g_object_ref) GdkCursor * gdk_cursor_ref (GdkCursor *cursor); GDK_DEPRECATED_IN_3_0_FOR(g_object_unref) void gdk_cursor_unref (GdkCursor *cursor); +GDK_AVAILABLE_IN_ALL GdkPixbuf* gdk_cursor_get_image (GdkCursor *cursor); +GDK_AVAILABLE_IN_ALL GdkCursorType gdk_cursor_get_cursor_type (GdkCursor *cursor); diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index c620905a60..dfa7051209 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -22,6 +22,7 @@ #error "Only <gdk/gdk.h> can be included directly." #endif +#include <gdk/gdkversionmacros.h> #include <gdk/gdktypes.h> @@ -141,75 +142,100 @@ struct _GdkTimeCoord gdouble axes[GDK_MAX_TIMECOORD_AXES]; }; +GDK_AVAILABLE_IN_ALL GType gdk_device_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL const gchar * gdk_device_get_name (GdkDevice *device); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_has_cursor (GdkDevice *device); /* Functions to configure a device */ +GDK_AVAILABLE_IN_ALL GdkInputSource gdk_device_get_source (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkInputMode gdk_device_get_mode (GdkDevice *device); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_set_mode (GdkDevice *device, GdkInputMode mode); +GDK_AVAILABLE_IN_ALL gint gdk_device_get_n_keys (GdkDevice *device); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_key (GdkDevice *device, guint index_, guint *keyval, GdkModifierType *modifiers); +GDK_AVAILABLE_IN_ALL void gdk_device_set_key (GdkDevice *device, guint index_, guint keyval, GdkModifierType modifiers); +GDK_AVAILABLE_IN_ALL GdkAxisUse gdk_device_get_axis_use (GdkDevice *device, guint index_); +GDK_AVAILABLE_IN_ALL void gdk_device_set_axis_use (GdkDevice *device, guint index_, GdkAxisUse use); +GDK_AVAILABLE_IN_ALL void gdk_device_get_state (GdkDevice *device, GdkWindow *window, gdouble *axes, GdkModifierType *mask); +GDK_AVAILABLE_IN_ALL void gdk_device_get_position (GdkDevice *device, GdkScreen **screen, gint *x, gint *y); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_device_get_window_at_position (GdkDevice *device, gint *win_x, gint *win_y); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_history (GdkDevice *device, GdkWindow *window, guint32 start, guint32 stop, GdkTimeCoord ***events, gint *n_events); +GDK_AVAILABLE_IN_ALL void gdk_device_free_history (GdkTimeCoord **events, gint n_events); +GDK_AVAILABLE_IN_ALL gint gdk_device_get_n_axes (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GList * gdk_device_list_axes (GdkDevice *device); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_axis_value (GdkDevice *device, gdouble *axes, GdkAtom axis_label, gdouble *value); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *value); +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_device_get_display (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkDevice * gdk_device_get_associated_device (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GList * gdk_device_list_slave_devices (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkDeviceType gdk_device_get_device_type (GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkGrabStatus gdk_device_grab (GdkDevice *device, GdkWindow *window, GdkGrabOwnership grab_ownership, @@ -218,14 +244,17 @@ GdkGrabStatus gdk_device_grab (GdkDevice *device, GdkCursor *cursor, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_device_ungrab (GdkDevice *device, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_device_warp (GdkDevice *device, GdkScreen *screen, gint x, gint y); +GDK_AVAILABLE_IN_ALL gboolean gdk_device_grab_info_libgtk_only (GdkDisplay *display, GdkDevice *device, GdkWindow **grab_window, diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h index f0e1afe5a8..b1ec4bd519 100644 --- a/gdk/gdkdevicemanager.h +++ b/gdk/gdkdevicemanager.h @@ -32,11 +32,15 @@ G_BEGIN_DECLS #define GDK_IS_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER)) +GDK_AVAILABLE_IN_ALL GType gdk_device_manager_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_device_manager_get_display (GdkDeviceManager *device_manager); +GDK_AVAILABLE_IN_ALL GList * gdk_device_manager_list_devices (GdkDeviceManager *device_manager, GdkDeviceType type); +GDK_AVAILABLE_IN_ALL GdkDevice * gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager); G_END_DECLS diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index e380028e49..5595cb9fb7 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -40,15 +40,20 @@ G_BEGIN_DECLS #define GDK_DISPLAY_OBJECT(object) GDK_DISPLAY(object) #endif +GDK_AVAILABLE_IN_ALL GType gdk_display_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkDisplay *gdk_display_open (const gchar *display_name); +GDK_AVAILABLE_IN_ALL const gchar * gdk_display_get_name (GdkDisplay *display); GDK_DEPRECATED_IN_3_10 gint gdk_display_get_n_screens (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL GdkScreen * gdk_display_get_screen (GdkDisplay *display, gint screen_num); +GDK_AVAILABLE_IN_ALL GdkScreen * gdk_display_get_default_screen (GdkDisplay *display); #ifndef GDK_MULTIDEVICE_SAFE @@ -62,29 +67,42 @@ GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed) gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display); #endif /* GDK_MULTIDEVICE_SAFE */ +GDK_AVAILABLE_IN_ALL gboolean gdk_display_device_is_grabbed (GdkDisplay *display, GdkDevice *device); +GDK_AVAILABLE_IN_ALL void gdk_display_beep (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_sync (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_flush (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_close (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_is_closed (GdkDisplay *display); GDK_DEPRECATED_IN_3_0_FOR(gdk_device_manager_list_devices) GList * gdk_display_list_devices (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_display_get_event (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_display_peek_event (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_put_event (GdkDisplay *display, const GdkEvent *event); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_has_pending (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_set_double_click_time (GdkDisplay *display, guint msec); +GDK_AVAILABLE_IN_ALL void gdk_display_set_double_click_distance (GdkDisplay *display, guint distance); +GDK_AVAILABLE_IN_ALL GdkDisplay *gdk_display_get_default (void); #ifndef GDK_MULTIDEVICE_SAFE @@ -105,36 +123,52 @@ void gdk_display_warp_pointer (GdkDisplay *disp gint y); #endif /* GDK_MULTIDEVICE_SAFE */ +GDK_AVAILABLE_IN_ALL GdkDisplay *gdk_display_open_default_libgtk_only (void); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_cursor_alpha (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_cursor_color (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL guint gdk_display_get_default_cursor_size (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_get_maximal_cursor_size (GdkDisplay *display, guint *width, guint *height); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_display_get_default_group (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_selection_notification (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_request_selection_notification (GdkDisplay *display, GdkAtom selection); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_clipboard_persistence (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_store_clipboard (GdkDisplay *display, GdkWindow *clipboard_window, guint32 time_, const GdkAtom *targets, gint n_targets); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_shapes (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_input_shapes (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL gboolean gdk_display_supports_composite (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_display_notify_startup_complete (GdkDisplay *display, const gchar *startup_id); +GDK_AVAILABLE_IN_ALL GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display); G_END_DECLS diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h index 419b3f5739..ebb4a2e12e 100644 --- a/gdk/gdkdisplaymanager.h +++ b/gdk/gdkdisplaymanager.h @@ -40,13 +40,19 @@ G_BEGIN_DECLS #define GDK_IS_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER)) +GDK_AVAILABLE_IN_ALL GType gdk_display_manager_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkDisplayManager *gdk_display_manager_get (void); +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_display_manager_get_default_display (GdkDisplayManager *manager); +GDK_AVAILABLE_IN_ALL void gdk_display_manager_set_default_display (GdkDisplayManager *manager, GdkDisplay *display); +GDK_AVAILABLE_IN_ALL GSList * gdk_display_manager_list_displays (GdkDisplayManager *manager); +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_display_manager_open_display (GdkDisplayManager *manager, const gchar *name); diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 3cadc200ef..127a9eb62b 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -89,43 +89,60 @@ typedef enum } GdkDragProtocol; +GDK_AVAILABLE_IN_ALL GType gdk_drag_context_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL void gdk_drag_context_set_device (GdkDragContext *context, GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkDevice * gdk_drag_context_get_device (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GList *gdk_drag_context_list_targets (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkDragAction gdk_drag_context_get_actions (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkDragAction gdk_drag_context_get_suggested_action (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkDragAction gdk_drag_context_get_selected_action (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_drag_context_get_source_window (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_drag_context_get_dest_window (GdkDragContext *context); +GDK_AVAILABLE_IN_ALL GdkDragProtocol gdk_drag_context_get_protocol (GdkDragContext *context); /* Destination side */ +GDK_AVAILABLE_IN_ALL void gdk_drag_status (GdkDragContext *context, GdkDragAction action, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_drop_reply (GdkDragContext *context, gboolean accepted, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_drop_finish (GdkDragContext *context, gboolean success, guint32 time_); +GDK_AVAILABLE_IN_ALL GdkAtom gdk_drag_get_selection (GdkDragContext *context); /* Source side */ +GDK_AVAILABLE_IN_ALL GdkDragContext * gdk_drag_begin (GdkWindow *window, GList *targets); +GDK_AVAILABLE_IN_ALL GdkDragContext * gdk_drag_begin_for_device (GdkWindow *window, GdkDevice *device, GList *targets); +GDK_AVAILABLE_IN_ALL void gdk_drag_find_window_for_screen (GdkDragContext *context, GdkWindow *drag_window, GdkScreen *screen, @@ -134,6 +151,7 @@ void gdk_drag_find_window_for_screen (GdkDragContext *context, GdkWindow **dest_window, GdkDragProtocol *protocol); +GDK_AVAILABLE_IN_ALL gboolean gdk_drag_motion (GdkDragContext *context, GdkWindow *dest_window, GdkDragProtocol protocol, @@ -142,10 +160,13 @@ gboolean gdk_drag_motion (GdkDragContext *context, GdkDragAction suggested_action, GdkDragAction possible_actions, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_drag_drop (GdkDragContext *context, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_drag_abort (GdkDragContext *context, guint32 time_); +GDK_AVAILABLE_IN_ALL gboolean gdk_drag_drop_succeeded (GdkDragContext *context); G_END_DECLS diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index 694505567d..999b0d37cb 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -1186,24 +1186,36 @@ union _GdkEvent GdkEventGrabBroken grab_broken; }; +GDK_AVAILABLE_IN_ALL GType gdk_event_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gboolean gdk_events_pending (void); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_event_get (void); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_event_peek (void); +GDK_AVAILABLE_IN_ALL void gdk_event_put (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_event_new (GdkEventType type); +GDK_AVAILABLE_IN_ALL GdkEvent* gdk_event_copy (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL void gdk_event_free (GdkEvent *event); +GDK_AVAILABLE_IN_ALL guint32 gdk_event_get_time (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL gboolean gdk_event_get_state (const GdkEvent *event, GdkModifierType *state); +GDK_AVAILABLE_IN_ALL gboolean gdk_event_get_coords (const GdkEvent *event, gdouble *x_win, gdouble *y_win); +GDK_AVAILABLE_IN_ALL gboolean gdk_event_get_root_coords (const GdkEvent *event, gdouble *x_root, gdouble *y_root); @@ -1227,46 +1239,61 @@ gboolean gdk_event_get_scroll_deltas (const GdkEvent *event, gdouble *delta_x, gdouble *delta_y); +GDK_AVAILABLE_IN_ALL gboolean gdk_event_get_axis (const GdkEvent *event, GdkAxisUse axis_use, gdouble *value); +GDK_AVAILABLE_IN_ALL void gdk_event_set_device (GdkEvent *event, GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkDevice* gdk_event_get_device (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL void gdk_event_set_source_device (GdkEvent *event, GdkDevice *device); +GDK_AVAILABLE_IN_ALL GdkDevice* gdk_event_get_source_device (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL void gdk_event_request_motions (const GdkEventMotion *event); GDK_AVAILABLE_IN_3_4 gboolean gdk_event_triggers_context_menu (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL gboolean gdk_events_get_distance (GdkEvent *event1, GdkEvent *event2, gdouble *distance); +GDK_AVAILABLE_IN_ALL gboolean gdk_events_get_angle (GdkEvent *event1, GdkEvent *event2, gdouble *angle); +GDK_AVAILABLE_IN_ALL gboolean gdk_events_get_center (GdkEvent *event1, GdkEvent *event2, gdouble *x, gdouble *y); +GDK_AVAILABLE_IN_ALL void gdk_event_handler_set (GdkEventFunc func, gpointer data, GDestroyNotify notify); +GDK_AVAILABLE_IN_ALL void gdk_event_set_screen (GdkEvent *event, GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GdkScreen *gdk_event_get_screen (const GdkEvent *event); GDK_AVAILABLE_IN_3_4 GdkEventSequence *gdk_event_get_event_sequence (const GdkEvent *event); +GDK_AVAILABLE_IN_ALL void gdk_set_show_events (gboolean show_events); +GDK_AVAILABLE_IN_ALL gboolean gdk_get_show_events (void); #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL gboolean gdk_setting_get (const gchar *name, GValue *value); diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h index ea5fdb4bbb..868ef22ef2 100644 --- a/gdk/gdkframeclock.h +++ b/gdk/gdkframeclock.h @@ -74,6 +74,7 @@ typedef enum { GDK_FRAME_CLOCK_PHASE_AFTER_PAINT = 1 << 6 } GdkFrameClockPhase; +GDK_AVAILABLE_IN_3_8 GType gdk_frame_clock_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_3_8 diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h index f402270ad9..4b594cd92c 100644 --- a/gdk/gdkkeys.h +++ b/gdk/gdkkeys.h @@ -77,16 +77,20 @@ struct _GdkKeymapKey * in the keymap and see what keyval it corresponds to. */ +GDK_AVAILABLE_IN_ALL GType gdk_keymap_get_type (void) G_GNUC_CONST; #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL GdkKeymap* gdk_keymap_get_default (void); #endif +GDK_AVAILABLE_IN_ALL GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display); - +GDK_AVAILABLE_IN_ALL guint gdk_keymap_lookup_key (GdkKeymap *keymap, const GdkKeymapKey *key); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, @@ -95,24 +99,32 @@ gboolean gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, gint *effective_group, gint *level, GdkModifierType *consumed_modifiers); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap, guint keyval, GdkKeymapKey **keys, gint *n_keys); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, gint *n_entries); +GDK_AVAILABLE_IN_ALL PangoDirection gdk_keymap_get_direction (GdkKeymap *keymap); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_have_bidi_layouts (GdkKeymap *keymap); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_get_caps_lock_state (GdkKeymap *keymap); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_get_num_lock_state (GdkKeymap *keymap); GDK_AVAILABLE_IN_3_4 guint gdk_keymap_get_modifier_state (GdkKeymap *keymap); +GDK_AVAILABLE_IN_ALL void gdk_keymap_add_virtual_modifiers (GdkKeymap *keymap, GdkModifierType *state); +GDK_AVAILABLE_IN_ALL gboolean gdk_keymap_map_virtual_modifiers (GdkKeymap *keymap, GdkModifierType *state); GDK_AVAILABLE_IN_3_4 @@ -122,18 +134,27 @@ GdkModifierType gdk_keymap_get_modifier_mask (GdkKeymap *keymap, /* Key values */ +GDK_AVAILABLE_IN_ALL gchar* gdk_keyval_name (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL guint gdk_keyval_from_name (const gchar *keyval_name); +GDK_AVAILABLE_IN_ALL void gdk_keyval_convert_case (guint symbol, guint *lower, guint *upper); +GDK_AVAILABLE_IN_ALL guint gdk_keyval_to_upper (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL guint gdk_keyval_to_lower (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gboolean gdk_keyval_is_upper (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gboolean gdk_keyval_is_lower (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL guint32 gdk_keyval_to_unicode (guint keyval) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL guint gdk_unicode_to_keyval (guint32 wc) G_GNUC_CONST; diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h index 580a3057d8..1e488ca4c5 100644 --- a/gdk/gdkmain.h +++ b/gdk/gdkmain.h @@ -40,29 +40,42 @@ G_BEGIN_DECLS #define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT) +GDK_AVAILABLE_IN_ALL void gdk_parse_args (gint *argc, gchar ***argv); +GDK_AVAILABLE_IN_ALL void gdk_init (gint *argc, gchar ***argv); +GDK_AVAILABLE_IN_ALL gboolean gdk_init_check (gint *argc, gchar ***argv); +GDK_AVAILABLE_IN_ALL void gdk_add_option_entries_libgtk_only (GOptionGroup *group); +GDK_AVAILABLE_IN_ALL void gdk_pre_parse_libgtk_only (void); +GDK_AVAILABLE_IN_ALL const gchar * gdk_get_program_class (void); +GDK_AVAILABLE_IN_ALL void gdk_set_program_class (const gchar *program_class); +GDK_AVAILABLE_IN_ALL void gdk_notify_startup_complete (void); +GDK_AVAILABLE_IN_ALL void gdk_notify_startup_complete_with_id (const gchar* startup_id); /* Push and pop error handlers for X errors */ +GDK_AVAILABLE_IN_ALL void gdk_error_trap_push (void); /* warn unused because you could use pop_ignored otherwise */ +GDK_AVAILABLE_IN_ALL G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop (void); +GDK_AVAILABLE_IN_ALL void gdk_error_trap_pop_ignored (void); +GDK_AVAILABLE_IN_ALL const gchar * gdk_get_display_arg_name (void); GDK_DEPRECATED_IN_3_8_FOR(gdk_display_get_name (gdk_display_get_default ())) @@ -93,20 +106,28 @@ GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed) gboolean gdk_pointer_is_grabbed (void); #endif /* GDK_MULTIDEVICE_SAFE */ +GDK_AVAILABLE_IN_ALL gint gdk_screen_width (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gint gdk_screen_height (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gint gdk_screen_width_mm (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL gint gdk_screen_height_mm (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL void gdk_set_double_click_time (guint msec); +GDK_AVAILABLE_IN_ALL void gdk_beep (void); #endif /* GDK_MULTIHEAD_SAFE */ +GDK_AVAILABLE_IN_ALL void gdk_flush (void); +GDK_AVAILABLE_IN_ALL void gdk_disable_multidevice (void); GDK_AVAILABLE_IN_3_10 diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h index 28402cd0d0..348f8f3336 100644 --- a/gdk/gdkpango.h +++ b/gdk/gdkpango.h @@ -23,13 +23,16 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS /************************************************************************/ +GDK_AVAILABLE_IN_ALL PangoContext *gdk_pango_context_get_for_screen (GdkScreen *screen); #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL PangoContext *gdk_pango_context_get (void); #endif @@ -40,11 +43,13 @@ PangoContext *gdk_pango_context_get (void); * draw with the region as clip, only the given ranges are drawn. */ +GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line, gint x_origin, gint y_origin, const gint *index_ranges, gint n_ranges); +GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_pango_layout_get_clip_region (PangoLayout *layout, gint x_origin, gint y_origin, diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index 96e2d7f7dd..4a96b1aee8 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -30,17 +30,20 @@ #endif #include <cairo.h> -#include <gdk/gdktypes.h> #include <gdk-pixbuf/gdk-pixbuf.h> +#include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS +GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_pixbuf_get_from_window (GdkWindow *window, gint src_x, gint src_y, gint width, gint height); +GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface, gint src_x, gint src_y, diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index c2902b8ae0..b0121d23f6 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -31,8 +31,10 @@ G_BEGIN_DECLS const char * _gdk_atom_name_const (GdkAtom atom); +GDK_AVAILABLE_IN_ALL void gdk_window_destroy_notify (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_synthesize_window_state (GdkWindow *window, GdkWindowState unset_flags, GdkWindowState set_flags); diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h index 795f1d4971..85420e55cb 100644 --- a/gdk/gdkproperty.h +++ b/gdk/gdkproperty.h @@ -30,6 +30,7 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS @@ -51,12 +52,16 @@ typedef enum } GdkPropMode; +GDK_AVAILABLE_IN_ALL GdkAtom gdk_atom_intern (const gchar *atom_name, gboolean only_if_exists); +GDK_AVAILABLE_IN_ALL GdkAtom gdk_atom_intern_static_string (const gchar *atom_name); +GDK_AVAILABLE_IN_ALL gchar* gdk_atom_name (GdkAtom atom); +GDK_AVAILABLE_IN_ALL gboolean gdk_property_get (GdkWindow *window, GdkAtom property, GdkAtom type, @@ -67,6 +72,7 @@ gboolean gdk_property_get (GdkWindow *window, gint *actual_format, gint *actual_length, guchar **data); +GDK_AVAILABLE_IN_ALL void gdk_property_change (GdkWindow *window, GdkAtom property, GdkAtom type, @@ -74,9 +80,11 @@ void gdk_property_change (GdkWindow *window, GdkPropMode mode, const guchar *data, gint nelements); +GDK_AVAILABLE_IN_ALL void gdk_property_delete (GdkWindow *window, GdkAtom property); +GDK_AVAILABLE_IN_ALL gint gdk_text_property_to_utf8_list_for_display (GdkDisplay *display, GdkAtom encoding, gint format, @@ -84,6 +92,7 @@ gint gdk_text_property_to_utf8_list_for_display (GdkDisplay *display, gint length, gchar ***list); +GDK_AVAILABLE_IN_ALL gchar *gdk_utf8_to_string_target (const gchar *str); G_END_DECLS diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h index 2a17299b5d..e098ea970f 100644 --- a/gdk/gdkrectangle.h +++ b/gdk/gdkrectangle.h @@ -30,18 +30,22 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS /* Rectangle utilities */ +GDK_AVAILABLE_IN_ALL gboolean gdk_rectangle_intersect (const GdkRectangle *src1, const GdkRectangle *src2, GdkRectangle *dest); +GDK_AVAILABLE_IN_ALL void gdk_rectangle_union (const GdkRectangle *src1, const GdkRectangle *src2, GdkRectangle *dest); +GDK_AVAILABLE_IN_ALL GType gdk_rectangle_get_type (void) G_GNUC_CONST; #define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ()) diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h index 9f0f0743b2..a37711ae39 100644 --- a/gdk/gdkrgba.h +++ b/gdk/gdkrgba.h @@ -30,6 +30,7 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS @@ -43,17 +44,24 @@ struct _GdkRGBA #define GDK_TYPE_RGBA (gdk_rgba_get_type ()) +GDK_AVAILABLE_IN_ALL GType gdk_rgba_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkRGBA * gdk_rgba_copy (const GdkRGBA *rgba); +GDK_AVAILABLE_IN_ALL void gdk_rgba_free (GdkRGBA *rgba); +GDK_AVAILABLE_IN_ALL guint gdk_rgba_hash (gconstpointer p); +GDK_AVAILABLE_IN_ALL gboolean gdk_rgba_equal (gconstpointer p1, gconstpointer p2); +GDK_AVAILABLE_IN_ALL gboolean gdk_rgba_parse (GdkRGBA *rgba, const gchar *spec); +GDK_AVAILABLE_IN_ALL gchar * gdk_rgba_to_string (const GdkRGBA *rgba); diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h index e3a66c654d..e01e1a9037 100644 --- a/gdk/gdkscreen.h +++ b/gdk/gdkscreen.h @@ -38,26 +38,43 @@ G_BEGIN_DECLS #define GDK_IS_SCREEN(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN)) +GDK_AVAILABLE_IN_ALL GType gdk_screen_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkVisual * gdk_screen_get_system_visual (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GdkVisual * gdk_screen_get_rgba_visual (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gboolean gdk_screen_is_composited (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_screen_get_root_window (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_screen_get_display (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_number (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_width (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_height (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_width_mm (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_height_mm (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GList * gdk_screen_list_visuals (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GList * gdk_screen_get_toplevel_windows (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gchar * gdk_screen_make_display_name (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_n_monitors (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_primary_monitor (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL void gdk_screen_get_monitor_geometry (GdkScreen *screen, gint monitor_num, GdkRectangle *dest); @@ -66,33 +83,46 @@ void gdk_screen_get_monitor_workarea (GdkScreen *screen, gint monitor_num, GdkRectangle *dest); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_monitor_at_point (GdkScreen *screen, gint x, gint y); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_monitor_at_window (GdkScreen *screen, GdkWindow *window); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_monitor_width_mm (GdkScreen *screen, gint monitor_num); +GDK_AVAILABLE_IN_ALL gint gdk_screen_get_monitor_height_mm (GdkScreen *screen, gint monitor_num); +GDK_AVAILABLE_IN_ALL gchar * gdk_screen_get_monitor_plug_name (GdkScreen *screen, gint monitor_num); +GDK_AVAILABLE_IN_ALL GdkScreen *gdk_screen_get_default (void); +GDK_AVAILABLE_IN_ALL gboolean gdk_screen_get_setting (GdkScreen *screen, const gchar *name, GValue *value); +GDK_AVAILABLE_IN_ALL void gdk_screen_set_font_options (GdkScreen *screen, const cairo_font_options_t *options); +GDK_AVAILABLE_IN_ALL const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL void gdk_screen_set_resolution (GdkScreen *screen, gdouble dpi); +GDK_AVAILABLE_IN_ALL gdouble gdk_screen_get_resolution (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_screen_get_active_window (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL GList *gdk_screen_get_window_stack (GdkScreen *screen); G_END_DECLS diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h index ae964e78f5..10d3935e41 100644 --- a/gdk/gdkselection.h +++ b/gdk/gdkselection.h @@ -30,6 +30,7 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS @@ -152,18 +153,22 @@ G_BEGIN_DECLS */ #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL gboolean gdk_selection_owner_set (GdkWindow *owner, GdkAtom selection, guint32 time_, gboolean send_event); +GDK_AVAILABLE_IN_ALL GdkWindow* gdk_selection_owner_get (GdkAtom selection); #endif/* GDK_MULTIHEAD_SAFE */ +GDK_AVAILABLE_IN_ALL gboolean gdk_selection_owner_set_for_display (GdkDisplay *display, GdkWindow *owner, GdkAtom selection, guint32 time_, gboolean send_event); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display, GdkAtom selection); @@ -181,21 +186,25 @@ GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display, * Retrieves the contents of a selection in a given * form. */ +GDK_AVAILABLE_IN_ALL void gdk_selection_convert (GdkWindow *requestor, GdkAtom selection, GdkAtom target, guint32 time_); +GDK_AVAILABLE_IN_ALL gint gdk_selection_property_get (GdkWindow *requestor, guchar **data, GdkAtom *prop_type, gint *prop_format); +GDK_AVAILABLE_IN_ALL void gdk_selection_send_notify (GdkWindow *requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time_); +GDK_AVAILABLE_IN_ALL void gdk_selection_send_notify_for_display (GdkDisplay *display, GdkWindow *requestor, GdkAtom selection, diff --git a/gdk/gdktestutils.h b/gdk/gdktestutils.h index dcbb6ea2de..ebccb56842 100644 --- a/gdk/gdktestutils.h +++ b/gdk/gdktestutils.h @@ -39,13 +39,16 @@ G_BEGIN_DECLS /* --- Gdk Test Utility API --- */ +GDK_AVAILABLE_IN_ALL void gdk_test_render_sync (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_test_simulate_key (GdkWindow *window, gint x, gint y, guint keyval, GdkModifierType modifiers, GdkEventType key_pressrelease); +GDK_AVAILABLE_IN_ALL gboolean gdk_test_simulate_button (GdkWindow *window, gint x, gint y, diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h index 8869cfc014..8bdc3e4388 100644 --- a/gdk/gdkthreads.h +++ b/gdk/gdkthreads.h @@ -30,11 +30,12 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS #if defined(GDK_COMPILATION) || defined(GTK_COMPILATION) -#define GDK_THREADS_DEPRECATED +#define GDK_THREADS_DEPRECATED _GDK_EXTERN #else #define GDK_THREADS_DEPRECATED GDK_DEPRECATED_IN_3_6 #endif @@ -49,25 +50,31 @@ GDK_THREADS_DEPRECATED void gdk_threads_set_lock_functions (GCallback enter_fn, GCallback leave_fn); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_idle_full (gint priority, GSourceFunc function, gpointer data, GDestroyNotify notify); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_idle (GSourceFunc function, gpointer data); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_timeout_full (gint priority, guint interval, GSourceFunc function, gpointer data, GDestroyNotify notify); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_timeout (guint interval, GSourceFunc function, gpointer data); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_timeout_seconds_full (gint priority, guint interval, GSourceFunc function, gpointer data, GDestroyNotify notify); +GDK_AVAILABLE_IN_ALL guint gdk_threads_add_timeout_seconds (guint interval, GSourceFunc function, gpointer data); diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h index c15808e8e9..187b019ef2 100644 --- a/gdk/gdkvisual.h +++ b/gdk/gdkvisual.h @@ -30,6 +30,7 @@ #endif #include <gdk/gdktypes.h> +#include <gdk/gdkversionmacros.h> G_BEGIN_DECLS @@ -78,41 +79,61 @@ typedef enum * a particular visual. */ +GDK_AVAILABLE_IN_ALL GType gdk_visual_get_type (void) G_GNUC_CONST; #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL gint gdk_visual_get_best_depth (void); +GDK_AVAILABLE_IN_ALL GdkVisualType gdk_visual_get_best_type (void); +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_visual_get_system (void); +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_visual_get_best (void); +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_visual_get_best_with_depth (gint depth); +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_visual_get_best_with_type (GdkVisualType visual_type); +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_visual_get_best_with_both (gint depth, GdkVisualType visual_type); +GDK_AVAILABLE_IN_ALL void gdk_query_depths (gint **depths, gint *count); +GDK_AVAILABLE_IN_ALL void gdk_query_visual_types (GdkVisualType **visual_types, gint *count); +GDK_AVAILABLE_IN_ALL GList* gdk_list_visuals (void); #endif +GDK_AVAILABLE_IN_ALL GdkScreen *gdk_visual_get_screen (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL GdkVisualType gdk_visual_get_visual_type (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL gint gdk_visual_get_depth (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL GdkByteOrder gdk_visual_get_byte_order (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL gint gdk_visual_get_colormap_size (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL gint gdk_visual_get_bits_per_rgb (GdkVisual *visual); +GDK_AVAILABLE_IN_ALL void gdk_visual_get_red_pixel_details (GdkVisual *visual, guint32 *mask, gint *shift, gint *precision); +GDK_AVAILABLE_IN_ALL void gdk_visual_get_green_pixel_details (GdkVisual *visual, guint32 *mask, gint *shift, gint *precision); +GDK_AVAILABLE_IN_ALL void gdk_visual_get_blue_pixel_details (GdkVisual *visual, guint32 *mask, gint *shift, diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index d2ee972cbb..b898a394c1 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -507,77 +507,109 @@ struct _GdkWindowClass /* Windows */ +GDK_AVAILABLE_IN_ALL GType gdk_window_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_ALL GdkWindow* gdk_window_new (GdkWindow *parent, GdkWindowAttr *attributes, gint attributes_mask); +GDK_AVAILABLE_IN_ALL void gdk_window_destroy (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindowType gdk_window_get_window_type (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_is_destroyed (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkVisual * gdk_window_get_visual (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkScreen * gdk_window_get_screen (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_window_get_display (GdkWindow *window); #ifndef GDK_MULTIDEVICE_SAFE GDK_DEPRECATED_IN_3_0_FOR(gdk_device_get_window_at_position) GdkWindow* gdk_window_at_pointer (gint *win_x, gint *win_y); #endif /* GDK_MULTIDEVICE_SAFE */ +GDK_AVAILABLE_IN_ALL void gdk_window_show (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_hide (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_withdraw (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_show_unraised (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_move (GdkWindow *window, gint x, gint y); +GDK_AVAILABLE_IN_ALL void gdk_window_resize (GdkWindow *window, gint width, gint height); +GDK_AVAILABLE_IN_ALL void gdk_window_move_resize (GdkWindow *window, gint x, gint y, gint width, gint height); +GDK_AVAILABLE_IN_ALL void gdk_window_reparent (GdkWindow *window, GdkWindow *new_parent, gint x, gint y); +GDK_AVAILABLE_IN_ALL void gdk_window_raise (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_lower (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_restack (GdkWindow *window, GdkWindow *sibling, gboolean above); +GDK_AVAILABLE_IN_ALL void gdk_window_focus (GdkWindow *window, guint32 timestamp); +GDK_AVAILABLE_IN_ALL void gdk_window_set_user_data (GdkWindow *window, gpointer user_data); +GDK_AVAILABLE_IN_ALL void gdk_window_set_override_redirect (GdkWindow *window, gboolean override_redirect); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_accept_focus (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_accept_focus (GdkWindow *window, gboolean accept_focus); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_focus_on_map (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_focus_on_map (GdkWindow *window, gboolean focus_on_map); +GDK_AVAILABLE_IN_ALL void gdk_window_add_filter (GdkWindow *window, GdkFilterFunc function, gpointer data); +GDK_AVAILABLE_IN_ALL void gdk_window_remove_filter (GdkWindow *window, GdkFilterFunc function, gpointer data); +GDK_AVAILABLE_IN_ALL void gdk_window_scroll (GdkWindow *window, gint dx, gint dy); +GDK_AVAILABLE_IN_ALL void gdk_window_move_region (GdkWindow *window, const cairo_region_t *region, gint dx, gint dy); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_ensure_native (GdkWindow *window); /* * This allows for making shaped (partially transparent) windows * - cool feature, needed for Drag and Drag for example. */ +GDK_AVAILABLE_IN_ALL void gdk_window_shape_combine_region (GdkWindow *window, const cairo_region_t *shape_region, gint offset_x, @@ -590,9 +622,12 @@ void gdk_window_shape_combine_region (GdkWindow *window, * * - Raster */ +GDK_AVAILABLE_IN_ALL void gdk_window_set_child_shapes (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_composited (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_composited (GdkWindow *window, gboolean composited); @@ -603,13 +638,17 @@ void gdk_window_set_composited (GdkWindow *window, * * - Raster */ +GDK_AVAILABLE_IN_ALL void gdk_window_merge_child_shapes (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_input_shape_combine_region (GdkWindow *window, const cairo_region_t *shape_region, gint offset_x, gint offset_y); +GDK_AVAILABLE_IN_ALL void gdk_window_set_child_input_shapes (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_merge_child_input_shapes (GdkWindow *window); @@ -619,111 +658,154 @@ void gdk_window_merge_child_input_shapes (GdkWindow *window); * Note that a window that is_viewable below is not necessarily * viewable in the X sense. */ +GDK_AVAILABLE_IN_ALL gboolean gdk_window_is_visible (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_is_viewable (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_is_input_only (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_is_shaped (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindowState gdk_window_get_state (GdkWindow *window); /* Set static bit gravity on the parent, and static * window gravity on all children. */ +GDK_AVAILABLE_IN_ALL gboolean gdk_window_set_static_gravities (GdkWindow *window, gboolean use_static); /* GdkWindow */ +GDK_AVAILABLE_IN_ALL gboolean gdk_window_has_native (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_type_hint (GdkWindow *window, GdkWindowTypeHint hint); +GDK_AVAILABLE_IN_ALL GdkWindowTypeHint gdk_window_get_type_hint (GdkWindow *window); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_modal_hint (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_modal_hint (GdkWindow *window, gboolean modal); +GDK_AVAILABLE_IN_ALL void gdk_window_set_skip_taskbar_hint (GdkWindow *window, gboolean skips_taskbar); +GDK_AVAILABLE_IN_ALL void gdk_window_set_skip_pager_hint (GdkWindow *window, gboolean skips_pager); +GDK_AVAILABLE_IN_ALL void gdk_window_set_urgency_hint (GdkWindow *window, gboolean urgent); +GDK_AVAILABLE_IN_ALL void gdk_window_set_geometry_hints (GdkWindow *window, const GdkGeometry *geometry, GdkWindowHints geom_mask); +GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_window_get_clip_region (GdkWindow *window); +GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_window_get_visible_region(GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_begin_paint_rect (GdkWindow *window, const GdkRectangle *rectangle); +GDK_AVAILABLE_IN_ALL void gdk_window_begin_paint_region (GdkWindow *window, const cairo_region_t *region); +GDK_AVAILABLE_IN_ALL void gdk_window_end_paint (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_flush (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_title (GdkWindow *window, const gchar *title); +GDK_AVAILABLE_IN_ALL void gdk_window_set_role (GdkWindow *window, const gchar *role); +GDK_AVAILABLE_IN_ALL void gdk_window_set_startup_id (GdkWindow *window, const gchar *startup_id); +GDK_AVAILABLE_IN_ALL void gdk_window_set_transient_for (GdkWindow *window, GdkWindow *parent); GDK_DEPRECATED_IN_3_4_FOR(gdk_window_set_background_rgba) void gdk_window_set_background (GdkWindow *window, const GdkColor *color); +GDK_AVAILABLE_IN_ALL void gdk_window_set_background_rgba (GdkWindow *window, const GdkRGBA *rgba); +GDK_AVAILABLE_IN_ALL void gdk_window_set_background_pattern (GdkWindow *window, cairo_pattern_t *pattern); +GDK_AVAILABLE_IN_ALL cairo_pattern_t *gdk_window_get_background_pattern (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_cursor (GdkWindow *window, GdkCursor *cursor); +GDK_AVAILABLE_IN_ALL GdkCursor *gdk_window_get_cursor (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_device_cursor (GdkWindow *window, GdkDevice *device, GdkCursor *cursor); +GDK_AVAILABLE_IN_ALL GdkCursor *gdk_window_get_device_cursor (GdkWindow *window, GdkDevice *device); +GDK_AVAILABLE_IN_ALL void gdk_window_get_user_data (GdkWindow *window, gpointer *data); +GDK_AVAILABLE_IN_ALL void gdk_window_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, gint *height); +GDK_AVAILABLE_IN_ALL int gdk_window_get_width (GdkWindow *window); +GDK_AVAILABLE_IN_ALL int gdk_window_get_height (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_get_position (GdkWindow *window, gint *x, gint *y); +GDK_AVAILABLE_IN_ALL gint gdk_window_get_origin (GdkWindow *window, gint *x, gint *y); +GDK_AVAILABLE_IN_ALL void gdk_window_get_root_coords (GdkWindow *window, gint x, gint y, gint *root_x, gint *root_y); +GDK_AVAILABLE_IN_ALL void gdk_window_coords_to_parent (GdkWindow *window, gdouble x, gdouble y, gdouble *parent_x, gdouble *parent_y); +GDK_AVAILABLE_IN_ALL void gdk_window_coords_from_parent (GdkWindow *window, gdouble parent_x, gdouble parent_y, gdouble *x, gdouble *y); +GDK_AVAILABLE_IN_ALL void gdk_window_get_root_origin (GdkWindow *window, gint *x, gint *y); +GDK_AVAILABLE_IN_ALL void gdk_window_get_frame_extents (GdkWindow *window, GdkRectangle *rect); @@ -734,61 +816,90 @@ GdkWindow * gdk_window_get_pointer (GdkWindow *window, gint *y, GdkModifierType *mask); #endif /* GDK_MULTIDEVICE_SAFE */ +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_window_get_device_position (GdkWindow *window, GdkDevice *device, gint *x, gint *y, GdkModifierType *mask); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_window_get_parent (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_window_get_toplevel (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_window_get_effective_parent (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_window_get_effective_toplevel (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GList * gdk_window_get_children (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GList * gdk_window_peek_children (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkEventMask gdk_window_get_events (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_events (GdkWindow *window, GdkEventMask event_mask); +GDK_AVAILABLE_IN_ALL void gdk_window_set_device_events (GdkWindow *window, GdkDevice *device, GdkEventMask event_mask); +GDK_AVAILABLE_IN_ALL GdkEventMask gdk_window_get_device_events (GdkWindow *window, GdkDevice *device); +GDK_AVAILABLE_IN_ALL void gdk_window_set_source_events (GdkWindow *window, GdkInputSource source, GdkEventMask event_mask); +GDK_AVAILABLE_IN_ALL GdkEventMask gdk_window_get_source_events (GdkWindow *window, GdkInputSource source); +GDK_AVAILABLE_IN_ALL void gdk_window_set_icon_list (GdkWindow *window, GList *pixbufs); +GDK_AVAILABLE_IN_ALL void gdk_window_set_icon_name (GdkWindow *window, const gchar *name); +GDK_AVAILABLE_IN_ALL void gdk_window_set_group (GdkWindow *window, GdkWindow *leader); +GDK_AVAILABLE_IN_ALL GdkWindow* gdk_window_get_group (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_decorations (GdkWindow *window, GdkWMDecoration decorations); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_decorations (GdkWindow *window, GdkWMDecoration *decorations); +GDK_AVAILABLE_IN_ALL void gdk_window_set_functions (GdkWindow *window, GdkWMFunction functions); +GDK_AVAILABLE_IN_ALL cairo_surface_t * gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, int width, int height); +GDK_AVAILABLE_IN_ALL void gdk_window_beep (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_iconify (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_deiconify (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_stick (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_unstick (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_maximize (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_unmaximize (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_fullscreen (GdkWindow *window); GDK_AVAILABLE_IN_3_8 void gdk_window_set_fullscreen_mode (GdkWindow *window, @@ -796,19 +907,26 @@ void gdk_window_set_fullscreen_mode (GdkWindow *window, GDK_AVAILABLE_IN_3_8 GdkFullscreenMode gdk_window_get_fullscreen_mode (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_unfullscreen (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_set_keep_above (GdkWindow *window, gboolean setting); +GDK_AVAILABLE_IN_ALL void gdk_window_set_keep_below (GdkWindow *window, gboolean setting); +GDK_AVAILABLE_IN_ALL void gdk_window_set_opacity (GdkWindow *window, gdouble opacity); +GDK_AVAILABLE_IN_ALL void gdk_window_register_dnd (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkDragProtocol gdk_window_get_drag_protocol(GdkWindow *window, GdkWindow **target); +GDK_AVAILABLE_IN_ALL void gdk_window_begin_resize_drag (GdkWindow *window, GdkWindowEdge edge, gint button, @@ -823,6 +941,7 @@ void gdk_window_begin_resize_drag_for_device (GdkWindow *window, gint root_x, gint root_y, guint32 timestamp); +GDK_AVAILABLE_IN_ALL void gdk_window_begin_move_drag (GdkWindow *window, gint button, gint root_x, @@ -837,9 +956,11 @@ void gdk_window_begin_move_drag_for_device (GdkWindow *window, guint32 timestamp); /* Interface for dirty-region queueing */ +GDK_AVAILABLE_IN_ALL void gdk_window_invalidate_rect (GdkWindow *window, const GdkRectangle *rect, gboolean invalidate_children); +GDK_AVAILABLE_IN_ALL void gdk_window_invalidate_region (GdkWindow *window, const cairo_region_t *region, gboolean invalidate_children); @@ -858,25 +979,35 @@ void gdk_window_invalidate_region (GdkWindow *window, typedef gboolean (*GdkWindowChildFunc) (GdkWindow *window, gpointer user_data); +GDK_AVAILABLE_IN_ALL void gdk_window_invalidate_maybe_recurse (GdkWindow *window, const cairo_region_t *region, GdkWindowChildFunc child_func, gpointer user_data); +GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_window_get_update_area (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_freeze_updates (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_thaw_updates (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_thaw_toplevel_updates_libgtk_only (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_process_all_updates (void); +GDK_AVAILABLE_IN_ALL void gdk_window_process_updates (GdkWindow *window, gboolean update_children); /* Enable/disable flicker, so you can tell if your code is inefficient. */ +GDK_AVAILABLE_IN_ALL void gdk_window_set_debug_updates (gboolean setting); +GDK_AVAILABLE_IN_ALL void gdk_window_constrain_size (GdkGeometry *geometry, guint flags, gint width, @@ -889,19 +1020,26 @@ void gdk_window_enable_synchronized_configure (GdkWindow *window); GDK_DEPRECATED_IN_3_8 void gdk_window_configure_finished (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_get_default_root_window (void); /* Offscreen redirection */ +GDK_AVAILABLE_IN_ALL cairo_surface_t * gdk_offscreen_window_get_surface (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_offscreen_window_set_embedder (GdkWindow *window, GdkWindow *embedder); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_offscreen_window_get_embedder (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_window_geometry_changed (GdkWindow *window); /* Multidevice support */ +GDK_AVAILABLE_IN_ALL void gdk_window_set_support_multidevice (GdkWindow *window, gboolean support_multidevice); +GDK_AVAILABLE_IN_ALL gboolean gdk_window_get_support_multidevice (GdkWindow *window); /* Frame clock */ diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h index 49a6749230..e933708c99 100644 --- a/gdk/quartz/gdkquartz.h +++ b/gdk/quartz/gdkquartz.h @@ -53,6 +53,7 @@ typedef enum GDK_OSX_NEW = 99 } GdkOSXVersion; +GDK_AVAILABLE_IN_ALL GdkOSXVersion gdk_quartz_osx_version (void); GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type); diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h index 14ee12dbef..d6fa967fcc 100644 --- a/gdk/quartz/gdkquartzcursor.h +++ b/gdk/quartz/gdkquartzcursor.h @@ -42,6 +42,7 @@ typedef GdkCursor GdkQuartzCursor; #endif typedef struct _GdkQuartzCursorClass GdkQuartzCursorClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_cursor_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h index f239016426..9e412eaeee 100644 --- a/gdk/quartz/gdkquartzdevice-core.h +++ b/gdk/quartz/gdkquartzdevice-core.h @@ -36,6 +36,7 @@ G_BEGIN_DECLS typedef struct _GdkQuartzDeviceCore GdkQuartzDeviceCore; typedef struct _GdkQuartzDeviceCoreClass GdkQuartzDeviceCoreClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_device_core_get_type (void) G_GNUC_CONST; G_END_DECLS diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h index d8aa156e6f..018c858249 100644 --- a/gdk/quartz/gdkquartzdevicemanager-core.h +++ b/gdk/quartz/gdkquartzdevicemanager-core.h @@ -37,6 +37,7 @@ typedef struct _GdkQuartzDeviceManagerCore GdkQuartzDeviceManagerCore; typedef struct _GdkQuartzDeviceManagerCoreClass GdkQuartzDeviceManagerCoreClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_device_manager_core_get_type (void) G_GNUC_CONST; diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h index 786a511556..4dbd2cbb26 100644 --- a/gdk/quartz/gdkquartzdisplay.h +++ b/gdk/quartz/gdkquartzdisplay.h @@ -43,6 +43,7 @@ typedef GdkDisplay GdkQuartzDisplay; typedef struct _GdkQuartzDisplayClass GdkQuartzDisplayClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_display_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h index 11662158cc..50bd8b15c4 100644 --- a/gdk/quartz/gdkquartzdisplaymanager.h +++ b/gdk/quartz/gdkquartzdisplaymanager.h @@ -39,6 +39,7 @@ typedef GdkDisplayManager _GdkQuartzDisplayManager; typedef struct _GdkDisplayManagerClass GdkQuartzDisplayManagerClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_display_manager_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h index 201b474b28..1fb4131754 100644 --- a/gdk/quartz/gdkquartzdnd.h +++ b/gdk/quartz/gdkquartzdnd.h @@ -42,8 +42,10 @@ typedef GdkDragContext GdkQuartzDragContext; typedef struct _GdkQuartzDragContextClass GdkQuartzDragContextClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_drag_context_get_type (void); +GDK_AVAILABLE_IN_ALL id gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context); G_END_DECLS diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h index fc4f4b0053..f35612e36a 100644 --- a/gdk/quartz/gdkquartzkeys.h +++ b/gdk/quartz/gdkquartzkeys.h @@ -42,6 +42,7 @@ typedef GdkKeymap GdkQuartzKeymap; #endif typedef struct _GdkQuartzKeymapClass GdkQuartzKeymapClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_keymap_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h index 5642d9579f..f6a265914c 100644 --- a/gdk/quartz/gdkquartzscreen.h +++ b/gdk/quartz/gdkquartzscreen.h @@ -42,6 +42,7 @@ typedef GdkScreen GdkQuartzScreen; typedef struct _GdkQuartzScreenClass GdkQuartzScreenClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_screen_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h index 127ce177bd..f6dcb965cb 100644 --- a/gdk/quartz/gdkquartzutils.h +++ b/gdk/quartz/gdkquartzutils.h @@ -28,7 +28,9 @@ G_BEGIN_DECLS +GDK_AVAILABLE_IN_ALL NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); +GDK_AVAILABLE_IN_ALL NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event); G_END_DECLS diff --git a/gdk/quartz/gdkquartzvisual.h b/gdk/quartz/gdkquartzvisual.h index 3199322f5c..3ca46ecf4b 100644 --- a/gdk/quartz/gdkquartzvisual.h +++ b/gdk/quartz/gdkquartzvisual.h @@ -43,6 +43,7 @@ typedef GdkVisual GdkQuartzVisual; typedef struct _GdkQuartzVisualClass GdkQuartzVisualClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_visual_get_type (void); G_END_DECLS diff --git a/gdk/quartz/gdkquartzwindow.h b/gdk/quartz/gdkquartzwindow.h index d33087cb18..a88eb16e9b 100644 --- a/gdk/quartz/gdkquartzwindow.h +++ b/gdk/quartz/gdkquartzwindow.h @@ -42,9 +42,12 @@ typedef GdkWindow GdkQuartzWindow; #endif typedef struct _GdkQuartzWindowClass GdkQuartzWindowClass; +GDK_AVAILABLE_IN_ALL GType gdk_quartz_window_get_type (void); +GDK_AVAILABLE_IN_ALL NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); +GDK_AVAILABLE_IN_ALL NSView *gdk_quartz_window_get_nsview (GdkWindow *window); G_END_DECLS diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h index 26e98db4dc..90ee02c37b 100644 --- a/gdk/wayland/gdkwaylanddevice.h +++ b/gdk/wayland/gdkwaylanddevice.h @@ -42,10 +42,14 @@ typedef struct _GdkWaylandDeviceClass GdkWaylandDeviceClass; #define GDK_IS_WAYLAND_DEVICE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_WAYLAND_DEVICE)) #define GDK_WAYLAND_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_WAYLAND_DEVICE, GdkWaylandDeviceClass)) +GDK_AVAILABLE_IN_ALL GType gdk_wayland_device_get_type (void); +GDK_AVAILABLE_IN_ALL struct wl_seat *gdk_wayland_device_get_wl_seat (GdkDevice *device); +GDK_AVAILABLE_IN_ALL struct wl_pointer *gdk_wayland_device_get_wl_pointer (GdkDevice *device); +GDK_AVAILABLE_IN_ALL struct wl_keyboard *gdk_wayland_device_get_wl_keyboard (GdkDevice *device); diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h index 1ec9964946..3510719923 100644 --- a/gdk/wayland/gdkwaylanddisplay.h +++ b/gdk/wayland/gdkwaylanddisplay.h @@ -42,11 +42,16 @@ typedef struct _GdkWaylandDisplayClass GdkWaylandDisplayClass; #define GDK_IS_WAYLAND_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY)) #define GDK_WAYLAND_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY, GdkWaylandDisplayClass)) +GDK_AVAILABLE_IN_ALL GType gdk_wayland_display_get_type (void); +GDK_AVAILABLE_IN_ALL struct wl_display *gdk_wayland_display_get_wl_display (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL struct wl_compositor *gdk_wayland_display_get_wl_compositor (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL struct wl_shell *gdk_wayland_display_get_wl_shell (GdkDisplay *display); +GDK_AVAILABLE_IN_3_10 void gdk_wayland_display_set_cursor_theme (GdkDisplay *display, const gchar *theme, gint size); diff --git a/gdk/wayland/gdkwaylandwindow.h b/gdk/wayland/gdkwaylandwindow.h index e1930d3b0c..0ce2c31bba 100644 --- a/gdk/wayland/gdkwaylandwindow.h +++ b/gdk/wayland/gdkwaylandwindow.h @@ -42,9 +42,12 @@ typedef struct _GdkWaylandWindowClass GdkWaylandWindowClass; #define GDK_IS_WAYLAND_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_WINDOW)) #define GDK_WAYLAND_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_WINDOW, GdkWaylandWindowClass)) +GDK_AVAILABLE_IN_ALL GType gdk_wayland_window_get_type (void); +GDK_AVAILABLE_IN_ALL struct wl_surface *gdk_wayland_window_get_wl_surface (GdkWindow *window); +GDK_AVAILABLE_IN_ALL struct wl_shell_surface *gdk_wayland_window_get_wl_shell_surface (GdkWindow *window); void gdk_wayland_window_set_use_custom_surface (GdkWindow *window); diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h index cf3f89c2b5..fe00c9ac44 100644 --- a/gdk/win32/gdkwin32.h +++ b/gdk/win32/gdkwin32.h @@ -77,26 +77,36 @@ G_BEGIN_DECLS /* Return true if the GdkWindow is a win32 implemented window */ +GDK_AVAILABLE_IN_ALL gboolean gdk_win32_window_is_win32 (GdkWindow *window); +GDK_AVAILABLE_IN_ALL HWND gdk_win32_window_get_impl_hwnd (GdkWindow *window); /* Return the Gdk* for a particular HANDLE */ +GDK_AVAILABLE_IN_ALL gpointer gdk_win32_handle_table_lookup (HWND handle); /* Translate from window to Windows handle */ +GDK_AVAILABLE_IN_ALL HGDIOBJ gdk_win32_window_get_handle (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_win32_selection_add_targets (GdkWindow *owner, GdkAtom selection, gint n_targets, GdkAtom *targets); /* For internal GTK use only */ +GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon); +GDK_AVAILABLE_IN_ALL HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf); +GDK_AVAILABLE_IN_ALL void gdk_win32_set_modal_dialog_libgtk_only (HWND window); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_win32_window_foreign_new_for_display (GdkDisplay *display, HWND anid); +GDK_AVAILABLE_IN_ALL GdkWindow * gdk_win32_window_lookup_for_display (GdkDisplay *display, HWND anid); diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h index 99b479f091..2d96052859 100644 --- a/gdk/win32/gdkwin32cursor.h +++ b/gdk/win32/gdkwin32cursor.h @@ -47,6 +47,7 @@ typedef GdkCursor GdkWin32Cursor; #endif typedef struct _GdkWin32CursorClass GdkWin32CursorClass; +GDK_AVAILABLE_IN_ALL GType gdk_win32_cursor_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h index ca257f2d83..c6e9feac12 100644 --- a/gdk/win32/gdkwin32display.h +++ b/gdk/win32/gdkwin32display.h @@ -47,6 +47,7 @@ typedef struct _GdkWin32DisplayClass GdkWin32DisplayClass; #define GDK_IS_WIN32_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_DISPLAY)) #define GDK_WIN32_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_DISPLAY, GdkWin32DisplayClass)) +GDK_AVAILABLE_IN_ALL GType gdk_win32_display_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h index e5d96b5565..b4d9e71923 100644 --- a/gdk/win32/gdkwin32displaymanager.h +++ b/gdk/win32/gdkwin32displaymanager.h @@ -40,6 +40,7 @@ typedef struct _GdkWin32DisplayManagerClass GdkWin32DisplayManagerClass; #define GDK_IS_WIN32_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_DISPLAY_MANAGER)) #define GDK_WIN32_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_DISPLAY_MANAGER, GdkWin32DisplayManagerClass)) +GDK_AVAILABLE_IN_ALL GType gdk_win32_display_manager_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h index 457d3ccfbb..31a0ee85e4 100644 --- a/gdk/win32/gdkwin32dnd.h +++ b/gdk/win32/gdkwin32dnd.h @@ -40,6 +40,7 @@ typedef GdkDragContext GdkWin32DragContext; #endif typedef struct _GdkWin32DragContextClass GdkWin32DragContextClass; +GDK_AVAILABLE_IN_ALL GType gdk_win32_drag_context_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h index c271d67861..790d64d67c 100644 --- a/gdk/win32/gdkwin32keys.h +++ b/gdk/win32/gdkwin32keys.h @@ -40,6 +40,7 @@ typedef struct _GdkWin32KeymapClass GdkWin32KeymapClass; #define GDK_IS_WIN32_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_KEYMAP)) #define GDK_WIN32_KEYMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_KEYMAP, GdkWin32KeymapClass)) +GDK_AVAILABLE_IN_ALL GType gdk_win32_keymap_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h index e64001b271..9f65dbb979 100644 --- a/gdk/win32/gdkwin32screen.h +++ b/gdk/win32/gdkwin32screen.h @@ -47,6 +47,7 @@ typedef GdkScreen GdkWin32Screen; #endif typedef struct _GdkWin32ScreenClass GdkWin32ScreenClass; +GDK_AVAILABLE_IN_ALL GType gdk_win32_screen_get_type (void); G_END_DECLS diff --git a/gdk/win32/gdkwin32window.h b/gdk/win32/gdkwin32window.h index ef5e11f888..22de021e68 100644 --- a/gdk/win32/gdkwin32window.h +++ b/gdk/win32/gdkwin32window.h @@ -47,6 +47,7 @@ typedef GdkWindow GdkWin32Window; #endif typedef struct _GdkWin32WindowClass GdkWin32WindowClass; +GDK_AVAILABLE_IN_ALL GType gdk_win32_window_get_type (void); G_END_DECLS diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h index 7e444e813c..e7d02edc07 100644 --- a/gdk/x11/gdkx11applaunchcontext.h +++ b/gdk/x11/gdkx11applaunchcontext.h @@ -40,6 +40,7 @@ typedef GdkAppLaunchContext GdkX11AppLaunchContext; #endif typedef struct _GdkX11AppLaunchContextClass GdkX11AppLaunchContextClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_app_launch_context_get_type (void); G_END_DECLS diff --git a/gdk/x11/gdkx11cursor.h b/gdk/x11/gdkx11cursor.h index 0c0f9b2a4a..8fb0b08f75 100644 --- a/gdk/x11/gdkx11cursor.h +++ b/gdk/x11/gdkx11cursor.h @@ -50,9 +50,12 @@ typedef GdkCursor GdkX11Cursor; #endif typedef struct _GdkX11CursorClass GdkX11CursorClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_cursor_get_type (void); +GDK_AVAILABLE_IN_ALL Display *gdk_x11_cursor_get_xdisplay (GdkCursor *cursor); +GDK_AVAILABLE_IN_ALL Cursor gdk_x11_cursor_get_xcursor (GdkCursor *cursor); /** diff --git a/gdk/x11/gdkx11device-core.h b/gdk/x11/gdkx11device-core.h index d1e57a4eb7..a3cfa96a48 100644 --- a/gdk/x11/gdkx11device-core.h +++ b/gdk/x11/gdkx11device-core.h @@ -33,6 +33,7 @@ typedef struct _GdkX11DeviceCore GdkX11DeviceCore; typedef struct _GdkX11DeviceCoreClass GdkX11DeviceCoreClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_device_core_get_type (void) G_GNUC_CONST; G_END_DECLS diff --git a/gdk/x11/gdkx11device-xi2.h b/gdk/x11/gdkx11device-xi2.h index 8c21f14cdb..e65a528a4c 100644 --- a/gdk/x11/gdkx11device-xi2.h +++ b/gdk/x11/gdkx11device-xi2.h @@ -32,6 +32,7 @@ G_BEGIN_DECLS typedef struct _GdkX11DeviceXI2 GdkX11DeviceXI2; typedef struct _GdkX11DeviceXI2Class GdkX11DeviceXI2Class; +GDK_AVAILABLE_IN_ALL GType gdk_x11_device_xi2_get_type (void) G_GNUC_CONST; G_END_DECLS diff --git a/gdk/x11/gdkx11devicemanager-core.h b/gdk/x11/gdkx11devicemanager-core.h index 0d65370f64..d1ea0b2b20 100644 --- a/gdk/x11/gdkx11devicemanager-core.h +++ b/gdk/x11/gdkx11devicemanager-core.h @@ -33,6 +33,7 @@ typedef struct _GdkX11DeviceManagerCore GdkX11DeviceManagerCore; typedef struct _GdkX11DeviceManagerCoreClass GdkX11DeviceManagerCoreClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_device_manager_core_get_type (void) G_GNUC_CONST; diff --git a/gdk/x11/gdkx11devicemanager-xi.h b/gdk/x11/gdkx11devicemanager-xi.h index 24be0443ba..d0582f2890 100644 --- a/gdk/x11/gdkx11devicemanager-xi.h +++ b/gdk/x11/gdkx11devicemanager-xi.h @@ -33,6 +33,7 @@ typedef struct _GdkX11DeviceManagerXI GdkX11DeviceManagerXI; typedef struct _GdkX11DeviceManagerXIClass GdkX11DeviceManagerXIClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_device_manager_xi_get_type (void) G_GNUC_CONST; diff --git a/gdk/x11/gdkx11devicemanager-xi2.h b/gdk/x11/gdkx11devicemanager-xi2.h index 026b31b2d2..9538f56f2c 100644 --- a/gdk/x11/gdkx11devicemanager-xi2.h +++ b/gdk/x11/gdkx11devicemanager-xi2.h @@ -33,6 +33,7 @@ typedef struct _GdkX11DeviceManagerXI2 GdkX11DeviceManagerXI2; typedef struct _GdkX11DeviceManagerXI2Class GdkX11DeviceManagerXI2Class; +GDK_AVAILABLE_IN_ALL GType gdk_x11_device_manager_xi2_get_type (void) G_GNUC_CONST; diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h index 323463b324..c4e66ecb77 100644 --- a/gdk/x11/gdkx11display.h +++ b/gdk/x11/gdkx11display.h @@ -50,40 +50,55 @@ typedef struct _GdkX11DisplayClass GdkX11DisplayClass; #define GDK_IS_X11_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY)) #define GDK_X11_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass)) +GDK_AVAILABLE_IN_ALL GType gdk_x11_display_get_type (void); +GDK_AVAILABLE_IN_ALL Display *gdk_x11_display_get_xdisplay (GdkDisplay *display); #define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display)) +GDK_AVAILABLE_IN_ALL guint32 gdk_x11_display_get_user_time (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_set_startup_notification_id (GdkDisplay *display, const gchar *startup_id); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_set_cursor_theme (GdkDisplay *display, const gchar *theme, const gint size); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_broadcast_startup_message (GdkDisplay *display, const char *message_type, ...) G_GNUC_NULL_TERMINATED; +GDK_AVAILABLE_IN_ALL GdkDisplay *gdk_x11_lookup_xdisplay (Display *xdisplay); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_grab (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_ungrab (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_error_trap_push (GdkDisplay *display); /* warn unused because you could use pop_ignored otherwise */ +GDK_AVAILABLE_IN_ALL G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display); +GDK_AVAILABLE_IN_ALL void gdk_x11_register_standard_event_type (GdkDisplay *display, gint event_base, gint n_events); +GDK_AVAILABLE_IN_ALL void gdk_x11_set_sm_client_id (const gchar *sm_client_id); diff --git a/gdk/x11/gdkx11displaymanager.h b/gdk/x11/gdkx11displaymanager.h index 3ffb944238..3e12c9df92 100644 --- a/gdk/x11/gdkx11displaymanager.h +++ b/gdk/x11/gdkx11displaymanager.h @@ -40,6 +40,7 @@ typedef struct _GdkX11DisplayManagerClass GdkX11DisplayManagerClass; #define GDK_IS_X11_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY_MANAGER)) #define GDK_X11_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManagerClass)) +GDK_AVAILABLE_IN_ALL GType gdk_x11_display_manager_get_type (void); G_END_DECLS diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h index 856d2f1090..a676314219 100644 --- a/gdk/x11/gdkx11dnd.h +++ b/gdk/x11/gdkx11dnd.h @@ -40,6 +40,7 @@ typedef GdkDragContext GdkX11DragContext; #endif typedef struct _GdkX11DragContextClass GdkX11DragContextClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_drag_context_get_type (void); G_END_DECLS diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h index 088cd0f95b..b69f040b53 100644 --- a/gdk/x11/gdkx11keys.h +++ b/gdk/x11/gdkx11keys.h @@ -40,6 +40,7 @@ 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); GDK_AVAILABLE_IN_3_6 diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h index f1fd9346df..ac610e0bf6 100644 --- a/gdk/x11/gdkx11property.h +++ b/gdk/x11/gdkx11property.h @@ -37,18 +37,26 @@ G_BEGIN_DECLS /* Functions to get the X Atom equivalent to the GdkAtom */ +GDK_AVAILABLE_IN_ALL Atom gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, GdkAtom atom); +GDK_AVAILABLE_IN_ALL GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, Atom xatom); +GDK_AVAILABLE_IN_ALL Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, const gchar *atom_name); +GDK_AVAILABLE_IN_ALL const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display, Atom xatom); #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL Atom gdk_x11_atom_to_xatom (GdkAtom atom); +GDK_AVAILABLE_IN_ALL GdkAtom gdk_x11_xatom_to_atom (Atom xatom); +GDK_AVAILABLE_IN_ALL Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); +GDK_AVAILABLE_IN_ALL const gchar * gdk_x11_get_xatom_name (Atom xatom); #endif diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h index 1c974ef286..efc7d3837e 100644 --- a/gdk/x11/gdkx11screen.h +++ b/gdk/x11/gdkx11screen.h @@ -50,14 +50,19 @@ typedef GdkScreen GdkX11Screen; #endif typedef struct _GdkX11ScreenClass GdkX11ScreenClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_screen_get_type (void); +GDK_AVAILABLE_IN_ALL Screen * gdk_x11_screen_get_xscreen (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL int gdk_x11_screen_get_screen_number (GdkScreen *screen); +GDK_AVAILABLE_IN_ALL const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen); #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL gint gdk_x11_get_default_screen (void); #endif @@ -91,9 +96,11 @@ gint gdk_x11_get_default_screen (void); */ #define GDK_SCREEN_XNUMBER(screen) (gdk_x11_screen_get_screen_number (screen)) +GDK_AVAILABLE_IN_ALL gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen, GdkAtom property); +GDK_AVAILABLE_IN_ALL XID gdk_x11_screen_get_monitor_output (GdkScreen *screen, gint monitor_num); diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h index e13b78d574..9123d473a2 100644 --- a/gdk/x11/gdkx11selection.h +++ b/gdk/x11/gdkx11selection.h @@ -36,25 +36,30 @@ G_BEGIN_DECLS +GDK_AVAILABLE_IN_ALL gint gdk_x11_display_text_property_to_text_list (GdkDisplay *display, GdkAtom encoding, gint format, const guchar *text, gint length, gchar ***list); +GDK_AVAILABLE_IN_ALL void gdk_x11_free_text_list (gchar **list); +GDK_AVAILABLE_IN_ALL gint gdk_x11_display_string_to_compound_text (GdkDisplay *display, const gchar *str, GdkAtom *encoding, gint *format, guchar **ctext, gint *length); +GDK_AVAILABLE_IN_ALL gboolean gdk_x11_display_utf8_to_compound_text (GdkDisplay *display, const gchar *str, GdkAtom *encoding, gint *format, guchar **ctext, gint *length); +GDK_AVAILABLE_IN_ALL void gdk_x11_free_compound_text (guchar *ctext); G_END_DECLS diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h index 4f62336391..9fdeac68a9 100644 --- a/gdk/x11/gdkx11utils.h +++ b/gdk/x11/gdkx11utils.h @@ -37,7 +37,9 @@ G_BEGIN_DECLS #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL Window gdk_x11_get_default_root_xwindow (void); +GDK_AVAILABLE_IN_ALL Display *gdk_x11_get_default_xdisplay (void); #endif @@ -68,7 +70,9 @@ Display *gdk_x11_get_default_xdisplay (void); #define GDK_POINTER_TO_XID(pointer) GPOINTER_TO_UINT(pointer) #ifndef GDK_MULTIHEAD_SAFE +GDK_AVAILABLE_IN_ALL void gdk_x11_grab_server (void); +GDK_AVAILABLE_IN_ALL void gdk_x11_ungrab_server (void); #endif diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h index 7c39ec2d8c..4b67aa2102 100644 --- a/gdk/x11/gdkx11visual.h +++ b/gdk/x11/gdkx11visual.h @@ -50,12 +50,15 @@ typedef GdkVisual GdkX11Visual; #endif typedef struct _GdkX11VisualClass GdkX11VisualClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_visual_get_type (void); +GDK_AVAILABLE_IN_ALL Visual * gdk_x11_visual_get_xvisual (GdkVisual *visual); #define GDK_VISUAL_XVISUAL(visual) (gdk_x11_visual_get_xvisual (visual)) +GDK_AVAILABLE_IN_ALL GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen, VisualID xvisualid); diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11window.h index 88cc40fa80..bf4d553873 100644 --- a/gdk/x11/gdkx11window.h +++ b/gdk/x11/gdkx11window.h @@ -50,9 +50,12 @@ typedef GdkWindow GdkX11Window; #endif typedef struct _GdkX11WindowClass GdkX11WindowClass; +GDK_AVAILABLE_IN_ALL GType gdk_x11_window_get_type (void); +GDK_AVAILABLE_IN_ALL Window gdk_x11_window_get_xid (GdkWindow *window); +GDK_AVAILABLE_IN_ALL void gdk_x11_window_set_user_time (GdkWindow *window, guint32 timestamp); GDK_AVAILABLE_IN_3_4 @@ -65,6 +68,7 @@ void gdk_x11_window_set_theme_variant (GdkWindow *window, GDK_AVAILABLE_IN_3_4 void gdk_x11_window_set_hide_titlebar_when_maximized (GdkWindow *window, gboolean hide_titlebar_when_maximized); +GDK_AVAILABLE_IN_ALL void gdk_x11_window_move_to_current_desktop (GdkWindow *window); /** @@ -87,10 +91,13 @@ void gdk_x11_window_move_to_current_desktop (GdkWindow *window); */ #define GDK_WINDOW_XID(win) (gdk_x11_window_get_xid (win)) +GDK_AVAILABLE_IN_ALL guint32 gdk_x11_get_server_time (GdkWindow *window); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_x11_window_foreign_new_for_display (GdkDisplay *display, Window window); +GDK_AVAILABLE_IN_ALL GdkWindow *gdk_x11_window_lookup_for_display (GdkDisplay *display, Window window); |