[gtk+] gdk: Remove GdkDisplay->ignore_core_pointer
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Remove GdkDisplay->ignore_core_pointer
- Date: Tue, 3 Apr 2012 09:40:23 +0000 (UTC)
commit c5a8f3cb61e49da186279efeecc10fed6f70685b
Author: Alexander Larsson <alexl redhat com>
Date: Tue Apr 3 11:35:25 2012 +0200
gdk: Remove GdkDisplay->ignore_core_pointer
This is not used anywhere anymore
gdk/gdkdisplayprivate.h | 1 -
gdk/gdkwindow.c | 93 +++++++++++++++++++++++------------------------
2 files changed, 45 insertions(+), 49 deletions(-)
---
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 8713cf7..6549f21 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -114,7 +114,6 @@ struct _GdkDisplay
GdkDevice *core_pointer; /* Core pointer device */
guint closed : 1; /* Whether this display has been closed */
- guint ignore_core_events : 1; /* Don't send core motion and button event */
GArray *touch_implicit_grabs;
GHashTable *device_grabs;
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4ae08ca..7ba6f15 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9469,56 +9469,53 @@ proxy_pointer_event (GdkDisplay *display,
if (!event_win)
return TRUE;
- if (!display->ignore_core_events)
- {
- event = gdk_event_new (event_type);
- event->any.window = g_object_ref (event_win);
- event->any.send_event = source_event->any.send_event;
+ event = gdk_event_new (event_type);
+ event->any.window = g_object_ref (event_win);
+ event->any.send_event = source_event->any.send_event;
- gdk_event_set_device (event, gdk_event_get_device (source_event));
- gdk_event_set_source_device (event, source_device);
+ gdk_event_set_device (event, gdk_event_get_device (source_event));
+ gdk_event_set_source_device (event, source_device);
- if (event_type == GDK_TOUCH_UPDATE)
- {
- event->touch.time = time_;
- event->touch.state = state | GDK_BUTTON1_MASK;
- event->touch.sequence = source_event->touch.sequence;
- event->touch.emulating_pointer = source_event->touch.emulating_pointer;
- convert_toplevel_coords_to_window (event_win,
- toplevel_x, toplevel_y,
- &event->touch.x, &event->touch.y);
- gdk_event_get_root_coords (source_event,
- &event->touch.x_root,
- &event->touch.y_root);
-
- event->touch.axes = g_memdup (source_event->touch.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (source_event->touch.device));
- }
- else
- {
- event->motion.time = time_;
- event->motion.state = state;
- event->motion.is_hint = is_hint;
-
- convert_toplevel_coords_to_window (event_win,
- toplevel_x, toplevel_y,
- &event->motion.x, &event->motion.y);
- gdk_event_get_root_coords (source_event,
- &event->motion.x_root,
- &event->motion.y_root);
-
- if (is_touch_type (source_event->type))
- event->motion.axes = g_memdup (source_event->touch.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (source_event->touch.device));
- else
- event->motion.axes = g_memdup (source_event->motion.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (source_event->motion.device));
- }
+ if (event_type == GDK_TOUCH_UPDATE)
+ {
+ event->touch.time = time_;
+ event->touch.state = state | GDK_BUTTON1_MASK;
+ event->touch.sequence = source_event->touch.sequence;
+ event->touch.emulating_pointer = source_event->touch.emulating_pointer;
+ convert_toplevel_coords_to_window (event_win,
+ toplevel_x, toplevel_y,
+ &event->touch.x, &event->touch.y);
+ gdk_event_get_root_coords (source_event,
+ &event->touch.x_root,
+ &event->touch.y_root);
+
+ event->touch.axes = g_memdup (source_event->touch.axes,
+ sizeof (gdouble) * gdk_device_get_n_axes (source_event->touch.device));
+ }
+ else
+ {
+ event->motion.time = time_;
+ event->motion.state = state;
+ event->motion.is_hint = is_hint;
+
+ convert_toplevel_coords_to_window (event_win,
+ toplevel_x, toplevel_y,
+ &event->motion.x, &event->motion.y);
+ gdk_event_get_root_coords (source_event,
+ &event->motion.x_root,
+ &event->motion.y_root);
+
+ if (is_touch_type (source_event->type))
+ event->motion.axes = g_memdup (source_event->touch.axes,
+ sizeof (gdouble) * gdk_device_get_n_axes (source_event->touch.device));
+ else
+ event->motion.axes = g_memdup (source_event->motion.axes,
+ sizeof (gdouble) * gdk_device_get_n_axes (source_event->motion.device));
+ }
- /* Just insert the event */
- _gdk_event_queue_insert_after (gdk_window_get_display (event_win),
- source_event, event);
- }
+ /* Just insert the event */
+ _gdk_event_queue_insert_after (gdk_window_get_display (event_win),
+ source_event, event);
}
/* unlink all move events from queue.
@@ -9663,7 +9660,7 @@ proxy_button_event (GdkEvent *source_event,
if (source_event->type == GDK_TOUCH_END && !is_touch_type (type))
state |= GDK_BUTTON1_MASK;
- if (event_win == NULL || display->ignore_core_events)
+ if (event_win == NULL)
return TRUE;
if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]