[gtk+/xi2: 1179/1239] Deprecate functions and mark as non-multidevice safe.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/xi2: 1179/1239] Deprecate functions and mark as non-multidevice safe.
- Date: Tue, 29 Sep 2009 10:57:39 +0000 (UTC)
commit 1ef285dc651ec42b17d0ddbfbb6697f0f87e56c7
Author: Carlos Garnacho <carlos gnome org>
Date: Thu Sep 17 21:04:33 2009 +0200
Deprecate functions and mark as non-multidevice safe.
GDK_MULTIDEVICE_SAFE is now used to mark non-multidevice safe functions.
GDK_DISABLE_DEPRECATED is now used to deprecate every function that doesn't
make sense anymore with GdkDeviceManager.
gdk/gdk.h | 5 +++++
gdk/gdk.symbols | 34 ++++++++++++++++++++++++++++++----
gdk/gdkdisplay.h | 17 ++++++++++++++---
gdk/gdkinput.h | 4 ++++
gdk/gdkwindow.h | 12 +++++++++---
5 files changed, 62 insertions(+), 10 deletions(-)
---
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 70bca89..a2c3326 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -114,6 +114,7 @@ gint gdk_input_add (gint source,
void gdk_input_remove (gint tag);
#endif /* GDK_DISABLE_DEPRECATED */
+#ifndef GDK_MULTIDEVICE_SAFE
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
gboolean owner_events,
GdkEventMask event_mask,
@@ -123,6 +124,7 @@ GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
gboolean owner_events,
guint32 time_);
+#endif /* GDK_MULTIDEVICE_SAFE */
GdkGrabStatus gdk_device_grab (GdkDevice *device,
GdkWindow *window,
@@ -138,9 +140,12 @@ gboolean gdk_device_grab_info_libgtk_only (GdkDisplay *display,
gboolean *owner_events);
#ifndef GDK_MULTIHEAD_SAFE
+
+#ifndef GDK_MULTIDEVICE_SAFE
void gdk_pointer_ungrab (guint32 time_);
void gdk_keyboard_ungrab (guint32 time_);
gboolean gdk_pointer_is_grabbed (void);
+#endif /* GDK_MULTIDEVICE_SAFE */
gint gdk_screen_width (void) G_GNUC_CONST;
gint gdk_screen_height (void) G_GNUC_CONST;
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 948723d..014b37a 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -75,18 +75,26 @@ gdk_set_use_xshm
#if IN_HEADER(__GDK_H__)
#if IN_FILE(__GDK_DISPLAY_C__)
gdk_beep
+#ifndef GDK_MULTIDEVICE_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
+#ifndef GDK_MULTIHEAD_SAFE
gdk_device_get_core_pointer
-gdk_display_get_core_pointer
gdk_set_pointer_hooks
+#endif
+gdk_display_get_core_pointer
+#endif
gdk_keyboard_ungrab
gdk_pointer_is_grabbed
gdk_pointer_ungrab
+#endif
gdk_event_send_client_message
gdk_event_send_clientmessage_toall
gdk_device_grab_info_libgtk_only
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_display_pointer_is_grabbed
#endif
#endif
+#endif
#if IN_HEADER(__GDK_H__)
#if IN_FILE(__GDK_IM_X11_C__)
@@ -174,9 +182,11 @@ gdk_screen_height_mm G_GNUC_CONST
#if IN_HEADER(__GDK_H__)
#if IN_FILE(__GDK_WINDOW_C__)
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_keyboard_grab
#endif
#endif
+#endif
#if IN_HEADER(__GDK_PROPERTY_H__)
#if IN_FILE(__GDK_SELECTION_C__)
@@ -401,10 +411,16 @@ gdk_device_set_source
#if IN_HEADER(__GDK_INPUT_H__)
#if IN_FILE(__GDK_INPUT_C__)
+#ifndef GDK_DISABLE_DEPRECATED
+#ifndef GDK_MULTIDEVICE_SAFE
+#ifndef GDK_MULTIHEAD_SAFE
gdk_devices_list
+#endif
gdk_input_set_extension_events
#endif
#endif
+#endif
+#endif
#if IN_HEADER(__GDK_DISPLAY_H__)
#if IN_FILE(__GDK_EVENTS_X11_C__)
@@ -416,22 +432,26 @@ gdk_display_add_client_message_filter
#if IN_FILE(__GDK_DISPLAY_C__)
gdk_display_close
gdk_display_get_event
-gdk_display_get_pointer
gdk_display_get_type G_GNUC_CONST
+gdk_display_peek_event
+gdk_display_put_event
+#ifndef GDK_MULTIDEVICE_SAFE
+gdk_display_get_pointer
gdk_display_get_window_at_pointer
gdk_display_keyboard_ungrab
-gdk_display_peek_event
gdk_display_pointer_ungrab
-gdk_display_put_event
gdk_display_set_pointer_hooks
#endif
#endif
+#endif
#if IN_HEADER(__GDK_DISPLAY_H__)
#if IN_FILE(__GDK_WINDOW_X11_C__)
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_display_warp_pointer
#endif
#endif
+#endif
#if IN_HEADER(__GDK_DISPLAY_H__)
#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
@@ -665,7 +685,9 @@ gdk_window_merge_child_input_shapes
gdk_window_set_static_gravities
gdk_window_reparent
gdk_window_add_filter
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_window_at_pointer
+#endif
gdk_window_begin_paint_rect
gdk_window_begin_paint_region
gdk_window_clear
@@ -680,7 +702,9 @@ gdk_window_freeze_updates
gdk_window_get_children
gdk_window_get_internal_paint_info
gdk_window_get_parent
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_window_get_pointer
+#endif
gdk_window_get_position
gdk_window_get_state
gdk_window_get_toplevel
@@ -707,7 +731,9 @@ gdk_window_set_user_data
gdk_window_thaw_toplevel_updates_libgtk_only
gdk_window_thaw_updates
gdk_window_set_composited
+#ifndef GDK_MULTIDEVICE_SAFE
gdk_pointer_grab
+#endif
gdk_window_beep
gdk_window_geometry_changed
gdk_window_ensure_native
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index d629d20..667eac7 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -175,14 +175,18 @@ gint gdk_display_get_n_screens (GdkDisplay *display);
GdkScreen * gdk_display_get_screen (GdkDisplay *display,
gint screen_num);
GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
+
+#ifndef GDK_MULTIDEVICE_SAFE
void gdk_display_pointer_ungrab (GdkDisplay *display,
guint32 time_);
-void gdk_display_device_ungrab (GdkDisplay *display,
- GdkDevice *device,
- guint32 time_);
void gdk_display_keyboard_ungrab (GdkDisplay *display,
guint32 time_);
gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display);
+#endif /* GDK_MULTIDEVICE_SAFE */
+
+void gdk_display_device_ungrab (GdkDisplay *display,
+ GdkDevice *device,
+ guint32 time_);
gboolean gdk_display_device_is_grabbed (GdkDisplay *display,
GdkDevice *device);
void gdk_display_beep (GdkDisplay *display);
@@ -210,7 +214,11 @@ void gdk_display_set_double_click_distance (GdkDisplay *display,
GdkDisplay *gdk_display_get_default (void);
+#ifndef GDK_MULTIDEVICE_SAFE
+
+#ifndef GDK_DISABLE_DEPRECATED
GdkDevice *gdk_display_get_core_pointer (GdkDisplay *display);
+#endif /* GDK_DISABLE_DEPRECATED */
void gdk_display_get_pointer (GdkDisplay *display,
GdkScreen **screen,
@@ -224,6 +232,7 @@ void gdk_display_warp_pointer (GdkDisplay *disp
GdkScreen *screen,
gint x,
gint y);
+#endif /* GDK_MULTIDEVICE_SAFE */
void gdk_display_get_device_state (GdkDisplay *display,
GdkDevice *device,
@@ -241,8 +250,10 @@ void gdk_display_warp_device (GdkDisplay
gint x,
gint y);
+#ifndef GDK_MULTIDEVICE_SAFE
GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay *display,
const GdkDisplayPointerHooks *new_hooks);
+#endif /* GDK_MULTIDEVICE_SAFE */
GdkDisplayDeviceHooks *gdk_display_set_device_hooks (GdkDisplay *display,
const GdkDisplayDeviceHooks *new_hooks);
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index 2d3f949..bf10f3e 100644
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -36,6 +36,8 @@
G_BEGIN_DECLS
+#if !defined (GDK_MULTIDEVICE_SAFE) && !defined (GDK_DISABLE_DEPRECATED)
+
#ifndef GDK_MULTIHEAD_SAFE
/* Returns a list of GdkDevice * */
@@ -51,6 +53,8 @@ void gdk_input_set_extension_events (GdkWindow *window,
gint mask,
GdkExtensionMode mode);
+#endif /* !GDK_MULTIDEVICE_SAFE && GDK_DISABLE_DEPRECATED */
+
G_END_DECLS
#endif /* __GDK_INPUT_H__ */
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index d22d1cb..9d979da 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -331,8 +331,11 @@ GdkWindow* gdk_window_new (GdkWindow *parent,
gint attributes_mask);
void gdk_window_destroy (GdkWindow *window);
GdkWindowType gdk_window_get_window_type (GdkWindow *window);
+
+#ifndef GDK_MULTIDEVICE_SAFE
GdkWindow* gdk_window_at_pointer (gint *win_x,
gint *win_y);
+#endif /* GDK_MULTIDEVICE_SAFE */
void gdk_window_show (GdkWindow *window);
void gdk_window_hide (GdkWindow *window);
void gdk_window_withdraw (GdkWindow *window);
@@ -556,10 +559,13 @@ void gdk_window_get_root_origin (GdkWindow *window,
gint *y);
void gdk_window_get_frame_extents (GdkWindow *window,
GdkRectangle *rect);
+
+#ifndef GDK_MULTIDEVICE_SAFE
GdkWindow* gdk_window_get_pointer (GdkWindow *window,
gint *x,
gint *y,
GdkModifierType *mask);
+#endif /* GDK_MULTIDEVICE_SAFE */
GdkWindow * gdk_window_get_device_position (GdkWindow *window,
GdkDevice *device,
gint *x,
@@ -668,9 +674,9 @@ void gdk_window_get_internal_paint_info (GdkWindow *window,
void gdk_window_enable_synchronized_configure (GdkWindow *window);
void gdk_window_configure_finished (GdkWindow *window);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);
-#endif /* GDK_MULTIHEAD_SAFE */
+#if !defined (GDK_MULTIHEAD_SAFE) && !defined (GDK_MULTIDEVICE_SAFE)
+GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);
+#endif /* !GDK_MULTIHEAD_SAFE && !GDK_MULTIDEVICE_SAFE */
GdkWindow *gdk_get_default_root_window (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]