[gtk/readonly-events-1: 30/51] Drop gdk_event_new and gdk_event_copy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/readonly-events-1: 30/51] Drop gdk_event_new and gdk_event_copy
- Date: Mon, 17 Feb 2020 05:49:17 +0000 (UTC)
commit ca624f73eeefb5be866670818bb0622b8a981090
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Feb 15 14:22:33 2020 -0500
Drop gdk_event_new and gdk_event_copy
These functions are no longer used outside of gdkevents.c.
gdk/gdkevents.c | 122 ++++++--------------------------------------------------
gdk/gdkevents.h | 4 +-
2 files changed, 15 insertions(+), 111 deletions(-)
---
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 05fe42fe42..2b39a10e3e 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -446,15 +446,7 @@ _gdk_event_queue_flush (GdkDisplay *display)
}
}
-/**
- * gdk_event_new:
- * @type: a #GdkEventType
- *
- * Creates a new event of the given type. All fields are set to 0.
- *
- * Returns: a newly-allocated #GdkEvent. Free with g_object_unref()
- */
-GdkEvent*
+static GdkEvent *
gdk_event_new (GdkEventType type)
{
return g_object_new (GDK_TYPE_EVENT,
@@ -462,6 +454,18 @@ gdk_event_new (GdkEventType type)
NULL);
}
+GdkEvent *
+gdk_event_ref (GdkEvent *event)
+{
+ return g_object_ref (event);
+}
+
+void
+gdk_event_unref (GdkEvent *event)
+{
+ g_object_unref (event);
+}
+
static void
gdk_event_constructed (GObject *object)
{
@@ -549,106 +553,6 @@ gdk_event_get_pointer_emulated (GdkEvent *event)
return (event->any.flags & GDK_EVENT_POINTER_EMULATED) != 0;
}
-static GdkTimeCoord *
-copy_time_coord (const GdkTimeCoord *coord)
-{
- return g_memdup (coord, sizeof (GdkTimeCoord));
-}
-
-/**
- * gdk_event_copy:
- * @event: a #GdkEvent
- *
- * Copies a #GdkEvent, copying or incrementing the reference count of the
- * resources associated with it (e.g. #GdkSurface’s and strings).
- *
- * Returns: (transfer full): a copy of @event. Free with g_object_unref()
- */
-GdkEvent*
-gdk_event_copy (const GdkEvent *event)
-{
- GdkEvent *new_event;
-
- g_return_val_if_fail (event != NULL, NULL);
-
- new_event = gdk_event_new (event->any.type);
-
- memcpy (EVENT_PAYLOAD (new_event),
- EVENT_PAYLOAD (event),
- EVENT_PAYLOAD_SIZE);
-
- if (new_event->any.surface)
- g_object_ref (new_event->any.surface);
- if (new_event->any.device)
- g_object_ref (new_event->any.device);
- if (new_event->any.source_device)
- g_object_ref (new_event->any.source_device);
- if (new_event->any.target)
- g_object_ref (new_event->any.target);
-
- switch ((guint) event->any.type)
- {
- case GDK_ENTER_NOTIFY:
- case GDK_LEAVE_NOTIFY:
- if (event->crossing.child_surface != NULL)
- g_object_ref (event->crossing.child_surface);
- if (event->crossing.related_target)
- g_object_ref (event->crossing.related_target);
- break;
-
- case GDK_FOCUS_CHANGE:
- if (event->focus_change.related_target)
- g_object_ref (event->focus_change.related_target);
- break;
-
- case GDK_DRAG_ENTER:
- case GDK_DRAG_LEAVE:
- case GDK_DRAG_MOTION:
- case GDK_DROP_START:
- g_object_ref (event->dnd.drop);
- break;
-
- case GDK_BUTTON_PRESS:
- case GDK_BUTTON_RELEASE:
- if (event->button.axes)
- new_event->button.axes = g_memdup (event->button.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (event->any.device));
- if (event->button.tool)
- g_object_ref (new_event->button.tool);
- break;
-
- case GDK_TOUCH_BEGIN:
- case GDK_TOUCH_UPDATE:
- case GDK_TOUCH_END:
- case GDK_TOUCH_CANCEL:
- if (event->touch.axes)
- new_event->touch.axes = g_memdup (event->touch.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (event->any.device));
- break;
-
- case GDK_MOTION_NOTIFY:
- if (event->motion.axes)
- new_event->motion.axes = g_memdup (event->motion.axes,
- sizeof (gdouble) * gdk_device_get_n_axes (event->any.device));
- if (event->motion.tool)
- g_object_ref (new_event->motion.tool);
-
- if (event->motion.history)
- {
- new_event->motion.history = g_list_copy_deep (event->motion.history,
- (GCopyFunc) copy_time_coord, NULL);
- }
- break;
-
- default:
- break;
- }
-
- _gdk_display_event_data_copy (gdk_event_get_display (event), event, new_event);
-
- return new_event;
-}
-
static void
gdk_event_finalize (GObject *object)
{
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index d93e2e50ad..84f893f680 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -341,9 +341,9 @@ GDK_AVAILABLE_IN_ALL
GType gdk_event_sequence_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
-GdkEvent* gdk_event_new (GdkEventType type);
+GdkEvent * gdk_event_ref (GdkEvent *event);
GDK_AVAILABLE_IN_ALL
-GdkEvent* gdk_event_copy (const GdkEvent *event);
+void gdk_event_unref (GdkEvent *event);
GDK_AVAILABLE_IN_ALL
GdkSurface *gdk_event_get_surface (const GdkEvent *event);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]