diff --git a/clutter/egl/clutter-egl.h b/clutter/egl/clutter-egl.h index 8edfc1f24..b25b1be5c 100644 --- a/clutter/egl/clutter-egl.h +++ b/clutter/egl/clutter-egl.h @@ -46,6 +46,7 @@ #endif #include "clutter-egl-headers.h" +#include G_BEGIN_DECLS @@ -85,10 +86,12 @@ EGLDisplay clutter_egl_display (void); * * Since: 1.6 */ +CLUTTER_AVAILABLE_IN_1_6 EGLDisplay clutter_egl_get_egl_display (void); #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT -void clutter_egl_set_kms_fd (int fd); +CLUTTER_AVAILABLE_IN_1_18 +void clutter_egl_set_kms_fd (int fd); #endif G_END_DECLS diff --git a/clutter/gdk/clutter-gdk.h b/clutter/gdk/clutter-gdk.h index f569718d4..a009378c5 100644 --- a/clutter/gdk/clutter-gdk.h +++ b/clutter/gdk/clutter-gdk.h @@ -41,17 +41,24 @@ G_BEGIN_DECLS +CLUTTER_AVAILABLE_IN_1_10 GdkDisplay * clutter_gdk_get_default_display (void); +CLUTTER_AVAILABLE_IN_1_10 void clutter_gdk_set_display (GdkDisplay *display); +CLUTTER_AVAILABLE_IN_1_10 GdkWindow * clutter_gdk_get_stage_window (ClutterStage *stage); +CLUTTER_AVAILABLE_IN_1_10 gboolean clutter_gdk_set_stage_foreign (ClutterStage *stage, GdkWindow *window); +CLUTTER_AVAILABLE_IN_1_10 GdkFilterReturn clutter_gdk_handle_event (GdkEvent *event); +CLUTTER_AVAILABLE_IN_1_10 ClutterStage * clutter_gdk_get_stage_from_window (GdkWindow *window); +CLUTTER_AVAILABLE_IN_1_10 void clutter_gdk_disable_event_retrieval (void); G_END_DECLS diff --git a/clutter/wayland/clutter-wayland-compositor.h b/clutter/wayland/clutter-wayland-compositor.h index a3e797113..703a7e2f5 100644 --- a/clutter/wayland/clutter-wayland-compositor.h +++ b/clutter/wayland/clutter-wayland-compositor.h @@ -37,8 +37,8 @@ G_BEGIN_DECLS -void -clutter_wayland_set_compositor_display (void *display); +CLUTTER_AVAILABLE_IN_1_10 +void clutter_wayland_set_compositor_display (void *display); G_END_DECLS diff --git a/clutter/win32/clutter-win32.h b/clutter/win32/clutter-win32.h index c6fd863dc..5112c3928 100644 --- a/clutter/win32/clutter-win32.h +++ b/clutter/win32/clutter-win32.h @@ -43,14 +43,19 @@ G_BEGIN_DECLS +CLUTTER_AVAILABLE_IN_ALL HWND clutter_win32_get_stage_window (ClutterStage *stage); +CLUTTER_AVAILABLE_IN_ALL ClutterStage *clutter_win32_get_stage_from_window (HWND hwnd); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_win32_set_stage_foreign (ClutterStage *stage, HWND hwnd); +CLUTTER_AVAILABLE_IN_ALL void clutter_win32_disable_event_retrieval (void); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_win32_handle_event (const MSG *msg); G_END_DECLS diff --git a/clutter/x11/clutter-glx-texture-pixmap.h b/clutter/x11/clutter-glx-texture-pixmap.h index 1563f92de..ffc967087 100644 --- a/clutter/x11/clutter-glx-texture-pixmap.h +++ b/clutter/x11/clutter-glx-texture-pixmap.h @@ -73,6 +73,7 @@ struct _ClutterGLXTexturePixmap ClutterGLXTexturePixmapPrivate *priv; }; +CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_get_type) GType clutter_glx_texture_pixmap_get_type (void); CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new) diff --git a/clutter/x11/clutter-x11-texture-pixmap.h b/clutter/x11/clutter-x11-texture-pixmap.h index ee963551e..8d2dc3338 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.h +++ b/clutter/x11/clutter-x11-texture-pixmap.h @@ -81,21 +81,30 @@ struct _ClutterX11TexturePixmapClass gint height); }; +CLUTTER_AVAILABLE_IN_ALL GType clutter_x11_texture_pixmap_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_ALL ClutterActor *clutter_x11_texture_pixmap_new (void); +CLUTTER_AVAILABLE_IN_ALL ClutterActor *clutter_x11_texture_pixmap_new_with_pixmap (Pixmap pixmap); +CLUTTER_AVAILABLE_IN_ALL ClutterActor *clutter_x11_texture_pixmap_new_with_window (Window window); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_texture_pixmap_set_automatic (ClutterX11TexturePixmap *texture, gboolean setting); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_texture_pixmap_set_pixmap (ClutterX11TexturePixmap *texture, Pixmap pixmap); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_texture_pixmap_set_window (ClutterX11TexturePixmap *texture, Window window, gboolean automatic); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_texture_pixmap_sync_window (ClutterX11TexturePixmap *texture); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_texture_pixmap_update_area (ClutterX11TexturePixmap *texture, gint x, gint y, diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h index 6913280b9..b0ab8a12a 100644 --- a/clutter/x11/clutter-x11.h +++ b/clutter/x11/clutter-x11.h @@ -97,32 +97,47 @@ typedef ClutterX11FilterReturn (*ClutterX11FilterFunc) (XEvent *xev, ClutterEvent *cev, gpointer data); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_trap_x_errors (void); +CLUTTER_AVAILABLE_IN_ALL gint clutter_x11_untrap_x_errors (void); +CLUTTER_AVAILABLE_IN_ALL Display *clutter_x11_get_default_display (void); +CLUTTER_AVAILABLE_IN_ALL int clutter_x11_get_default_screen (void); +CLUTTER_AVAILABLE_IN_ALL Window clutter_x11_get_root_window (void); +CLUTTER_AVAILABLE_IN_ALL XVisualInfo *clutter_x11_get_visual_info (void); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_set_display (Display * xdpy); CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info) XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage); +CLUTTER_AVAILABLE_IN_ALL Window clutter_x11_get_stage_window (ClutterStage *stage); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_x11_set_stage_foreign (ClutterStage *stage, Window xwindow); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_add_filter (ClutterX11FilterFunc func, gpointer data); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_remove_filter (ClutterX11FilterFunc func, gpointer data); +CLUTTER_AVAILABLE_IN_ALL ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_disable_event_retrieval (void); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_x11_has_event_retrieval (void); +CLUTTER_AVAILABLE_IN_ALL ClutterStage *clutter_x11_get_stage_from_window (Window win); CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices) @@ -130,17 +145,24 @@ const GSList* clutter_x11_get_input_devices (void); CLUTTER_DEPRECATED_IN_1_14 void clutter_x11_enable_xinput (void); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_x11_has_xinput (void); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_x11_has_composite_extension (void); +CLUTTER_AVAILABLE_IN_ALL void clutter_x11_set_use_argb_visual (gboolean use_argb); +CLUTTER_AVAILABLE_IN_ALL gboolean clutter_x11_get_use_argb_visual (void); +CLUTTER_AVAILABLE_IN_ALL Time clutter_x11_get_current_event_time (void); +CLUTTER_AVAILABLE_IN_ALL gint clutter_x11_event_get_key_group (const ClutterEvent *event); +CLUTTER_AVAILABLE_IN_ALL guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence); G_END_DECLS