From fec26f201a96e297106878b33558f2f78e666a01 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 3 Aug 2023 14:40:01 +0200 Subject: [PATCH] clutter: Drop all ClutterEvent setter functions All events are now created through the dedicated constructors, thus no post-creation event fiddling should be necessary. Part-of: --- clutter/clutter/clutter-event-private.h | 7 - clutter/clutter/clutter-event.c | 461 ------------------------ clutter/clutter/clutter-event.h | 47 --- 3 files changed, 515 deletions(-) diff --git a/clutter/clutter/clutter-event-private.h b/clutter/clutter/clutter-event-private.h index a2aab3e2a..73239c328 100644 --- a/clutter/clutter/clutter-event-private.h +++ b/clutter/clutter/clutter-event-private.h @@ -151,10 +151,6 @@ ClutterEvent * clutter_event_im_new (ClutterEventType type, uint32_t len, ClutterPreeditResetMode mode); -CLUTTER_EXPORT -void _clutter_event_set_pointer_emulated (ClutterEvent *event, - gboolean is_emulated); - /* Reinjecting queued events for processing */ CLUTTER_EXPORT void clutter_stage_process_event (ClutterStage *stage, @@ -167,9 +163,6 @@ gboolean _clutter_event_process_filters (ClutterEvent *event, /* clears the event queue inside the main context */ void _clutter_clear_events_queue (void); -CLUTTER_EXPORT -void _clutter_event_set_platform_data (ClutterEvent *event, - gpointer data); CLUTTER_EXPORT gpointer _clutter_event_get_platform_data (const ClutterEvent *event); diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c index bf668e237..24cbd576d 100644 --- a/clutter/clutter/clutter-event.c +++ b/clutter/clutter/clutter-event.c @@ -99,27 +99,6 @@ _clutter_event_get_platform_data (const ClutterEvent *event) return ((ClutterEventPrivate *) event)->platform_data; } -/*< private > - * _clutter_event_set_platform_data: - * @event: a #ClutterEvent - * @data: a pointer to platform-specific data - * - * Sets the pointer to platform-specific data inside an event - */ -void -_clutter_event_set_platform_data (ClutterEvent *event, - gpointer data) -{ - ((ClutterEventPrivate *) event)->platform_data = data; -} - -void -_clutter_event_set_pointer_emulated (ClutterEvent *event, - gboolean is_emulated) -{ - ((ClutterEventPrivate *) event)->is_pointer_emulated = !!is_emulated; -} - /** * clutter_event_type: * @event: a #ClutterEvent @@ -152,22 +131,6 @@ clutter_event_get_time (const ClutterEvent *event) return event->any.time; } -/** - * clutter_event_set_time: - * @event: a #ClutterEvent - * @time_: the time of the event - * - * Sets the time of the event. - */ -void -clutter_event_set_time (ClutterEvent *event, - guint32 time_) -{ - g_return_if_fail (event != NULL); - - event->any.time = time_; -} - /** * clutter_event_get_state: * @event: a #ClutterEvent @@ -212,51 +175,6 @@ clutter_event_get_state (const ClutterEvent *event) return 0; } -/** - * clutter_event_set_state: - * @event: a #ClutterEvent - * @state: the modifier state to set - * - * Sets the modifier state of the event. - */ -void -clutter_event_set_state (ClutterEvent *event, - ClutterModifierType state) -{ - g_return_if_fail (event != NULL); - - switch (event->type) - { - case CLUTTER_KEY_PRESS: - case CLUTTER_KEY_RELEASE: - event->key.modifier_state = state; - break; - - case CLUTTER_BUTTON_PRESS: - case CLUTTER_BUTTON_RELEASE: - event->button.modifier_state = state; - break; - - case CLUTTER_MOTION: - event->motion.modifier_state = state; - break; - - case CLUTTER_TOUCH_BEGIN: - case CLUTTER_TOUCH_UPDATE: - case CLUTTER_TOUCH_END: - case CLUTTER_TOUCH_CANCEL: - event->touch.modifier_state = state; - break; - - case CLUTTER_SCROLL: - event->scroll.modifier_state = state; - break; - - default: - break; - } -} - /** * clutter_event_get_coords: * @event: a #ClutterEvent @@ -360,87 +278,6 @@ clutter_event_get_position (const ClutterEvent *event, } -/** - * clutter_event_set_coords: - * @event: a #ClutterEvent - * @x: the X coordinate of the event - * @y: the Y coordinate of the event - * - * Sets the coordinates of the @event. - */ -void -clutter_event_set_coords (ClutterEvent *event, - gfloat x, - gfloat y) -{ - g_return_if_fail (event != NULL); - - switch (event->type) - { - case CLUTTER_NOTHING: - case CLUTTER_KEY_PRESS: - case CLUTTER_KEY_RELEASE: - case CLUTTER_EVENT_LAST: - case CLUTTER_PROXIMITY_IN: - case CLUTTER_PROXIMITY_OUT: - case CLUTTER_PAD_BUTTON_PRESS: - case CLUTTER_PAD_BUTTON_RELEASE: - case CLUTTER_PAD_STRIP: - case CLUTTER_PAD_RING: - case CLUTTER_DEVICE_ADDED: - case CLUTTER_DEVICE_REMOVED: - case CLUTTER_IM_COMMIT: - case CLUTTER_IM_DELETE: - case CLUTTER_IM_PREEDIT: - break; - - case CLUTTER_ENTER: - case CLUTTER_LEAVE: - event->crossing.x = x; - event->crossing.y = y; - break; - - case CLUTTER_BUTTON_PRESS: - case CLUTTER_BUTTON_RELEASE: - event->button.x = x; - event->button.y = y; - break; - - case CLUTTER_MOTION: - event->motion.x = x; - event->motion.y = y; - break; - - case CLUTTER_TOUCH_BEGIN: - case CLUTTER_TOUCH_UPDATE: - case CLUTTER_TOUCH_END: - case CLUTTER_TOUCH_CANCEL: - event->touch.x = x; - event->touch.y = y; - break; - - case CLUTTER_SCROLL: - event->scroll.x = x; - event->scroll.y = y; - break; - - case CLUTTER_TOUCHPAD_PINCH: - event->touchpad_pinch.x = x; - event->touchpad_pinch.y = y; - break; - - case CLUTTER_TOUCHPAD_SWIPE: - event->touchpad_swipe.x = x; - event->touchpad_swipe.y = y; - break; - - case CLUTTER_TOUCHPAD_HOLD: - event->touchpad_hold.x = x; - event->touchpad_hold.y = y; - break; - } -} - /** * clutter_event_get_source: * @event: a #ClutterEvent @@ -462,19 +299,6 @@ clutter_event_get_source (const ClutterEvent *event) return NULL; } -/** - * clutter_event_set_source: - * @event: a #ClutterEvent - * @actor: (allow-none): a #ClutterActor, or %NULL - * - * Sets the source #ClutterActor of @event. - */ -void -clutter_event_set_source (ClutterEvent *event, - ClutterActor *actor) -{ -} - /** * clutter_event_get_flags: * @event: a #ClutterEvent @@ -491,26 +315,6 @@ clutter_event_get_flags (const ClutterEvent *event) return event->any.flags; } -/** - * clutter_event_set_flags: - * @event: a #ClutterEvent - * @flags: a binary OR of #ClutterEventFlags values - * - * Sets the #ClutterEventFlags of @event - */ -void -clutter_event_set_flags (ClutterEvent *event, - ClutterEventFlags flags) -{ - g_return_if_fail (event != NULL); - - if (event->any.flags == flags) - return; - - event->any.flags = flags; - event->any.flags |= CLUTTER_EVENT_FLAG_SYNTHETIC; -} - /** * clutter_event_get_related: * @event: a #ClutterEvent of type %CLUTTER_ENTER or of @@ -530,50 +334,6 @@ clutter_event_get_related (const ClutterEvent *event) return event->crossing.related; } -/** - * clutter_event_set_related: - * @event: a #ClutterEvent of type %CLUTTER_ENTER or %CLUTTER_LEAVE - * @actor: (allow-none): a #ClutterActor or %NULL - * - * Sets the related actor of a crossing event - */ -void -clutter_event_set_related (ClutterEvent *event, - ClutterActor *actor) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_ENTER || - event->type == CLUTTER_LEAVE); - g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor)); - - if (event->crossing.related == actor) - return; - - event->crossing.related = actor; -} - -/** - * clutter_event_set_scroll_delta: - * @event: a #ClutterEvent of type %CLUTTER_SCROLL - * @dx: delta on the horizontal axis - * @dy: delta on the vertical axis - * - * Sets the precise scrolling information of @event. - */ -void -clutter_event_set_scroll_delta (ClutterEvent *event, - gdouble dx, - gdouble dy) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_SCROLL); - - event->scroll.direction = CLUTTER_SCROLL_SMOOTH; - - ((ClutterEventPrivate *) event)->delta_x = dx; - ((ClutterEventPrivate *) event)->delta_y = dy; -} - /** * clutter_event_get_scroll_delta: * @event: a #ClutterEvent of type %CLUTTER_SCROLL @@ -623,23 +383,6 @@ clutter_event_get_scroll_direction (const ClutterEvent *event) return event->scroll.direction; } -/** - * clutter_event_set_scroll_direction: - * @event: a #ClutterEvent - * @direction: the scrolling direction - * - * Sets the direction of the scrolling of @event - */ -void -clutter_event_set_scroll_direction (ClutterEvent *event, - ClutterScrollDirection direction) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_SCROLL); - - event->scroll.direction = direction; -} - /** * clutter_event_get_button: * @event: a #ClutterEvent of type %CLUTTER_BUTTON_PRESS or @@ -665,25 +408,6 @@ clutter_event_get_button (const ClutterEvent *event) return event->pad_button.button; } -/** - * clutter_event_set_button: - * @event: a #ClutterEvent or type %CLUTTER_BUTTON_PRESS or - * of type %CLUTTER_BUTTON_RELEASE - * @button: the button number - * - * Sets the button number of @event - */ -void -clutter_event_set_button (ClutterEvent *event, - guint32 button) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_BUTTON_PRESS || - event->type == CLUTTER_BUTTON_RELEASE); - - event->button.button = button; -} - /* keys */ /** @@ -705,25 +429,6 @@ clutter_event_get_key_symbol (const ClutterEvent *event) return event->key.keyval; } -/** - * clutter_event_set_key_symbol: - * @event: a #ClutterEvent of type %CLUTTER_KEY_PRESS - * or %CLUTTER_KEY_RELEASE - * @key_sym: the key symbol representing the key - * - * Sets the key symbol of @event. - */ -void -clutter_event_set_key_symbol (ClutterEvent *event, - guint key_sym) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_KEY_PRESS || - event->type == CLUTTER_KEY_RELEASE); - - event->key.keyval = key_sym; -} - /** * clutter_event_get_key_code: * @event: a #ClutterEvent of type %CLUTTER_KEY_PRESS or @@ -743,25 +448,6 @@ clutter_event_get_key_code (const ClutterEvent *event) return event->key.hardware_keycode; } -/** - * clutter_event_set_key_code: - * @event: a #ClutterEvent of type %CLUTTER_KEY_PRESS - * or %CLUTTER_KEY_RELEASE - * @key_code: the keycode representing the key - * - * Sets the keycode of the @event. - */ -void -clutter_event_set_key_code (ClutterEvent *event, - guint16 key_code) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_KEY_PRESS || - event->type == CLUTTER_KEY_RELEASE); - - event->key.hardware_keycode = key_code; -} - /** * clutter_event_get_key_unicode: * @event: a #ClutterEvent of type %CLUTTER_KEY_PRESS @@ -784,25 +470,6 @@ clutter_event_get_key_unicode (const ClutterEvent *event) return clutter_keysym_to_unicode (event->key.keyval); } -/** - * clutter_event_set_key_unicode: - * @event: a #ClutterEvent of type %CLUTTER_KEY_PRESS - * or %CLUTTER_KEY_RELEASE - * @key_unicode: the Unicode value representing the key - * - * Sets the Unicode value of @event. - */ -void -clutter_event_set_key_unicode (ClutterEvent *event, - gunichar key_unicode) -{ - g_return_if_fail (event != NULL); - g_return_if_fail (event->type == CLUTTER_KEY_PRESS || - event->type == CLUTTER_KEY_RELEASE); - - event->key.unicode_value = key_unicode; -} - /** * clutter_event_get_event_sequence: * @event: a #ClutterEvent of type %CLUTTER_TOUCH_BEGIN, @@ -853,94 +520,6 @@ clutter_event_get_device_type (const ClutterEvent *event) return CLUTTER_POINTER_DEVICE; } -/** - * clutter_event_set_device: - * @event: a #ClutterEvent - * @device: (allow-none): a #ClutterInputDevice, or %NULL - * - * Sets the device for @event. - */ -void -clutter_event_set_device (ClutterEvent *event, - ClutterInputDevice *device) -{ - ClutterEventPrivate *real_event = (ClutterEventPrivate *) event; - - g_return_if_fail (event != NULL); - g_return_if_fail (device == NULL || CLUTTER_IS_INPUT_DEVICE (device)); - - g_set_object (&real_event->device, device); - - switch (event->type) - { - case CLUTTER_NOTHING: - case CLUTTER_EVENT_LAST: - case CLUTTER_IM_COMMIT: - case CLUTTER_IM_DELETE: - case CLUTTER_IM_PREEDIT: - break; - - case CLUTTER_ENTER: - case CLUTTER_LEAVE: - event->crossing.device = device; - break; - - case CLUTTER_BUTTON_PRESS: - case CLUTTER_BUTTON_RELEASE: - event->button.device = device; - break; - - case CLUTTER_MOTION: - event->motion.device = device; - break; - - case CLUTTER_SCROLL: - event->scroll.device = device; - break; - - case CLUTTER_TOUCH_BEGIN: - case CLUTTER_TOUCH_UPDATE: - case CLUTTER_TOUCH_END: - case CLUTTER_TOUCH_CANCEL: - event->touch.device = device; - break; - - case CLUTTER_KEY_PRESS: - case CLUTTER_KEY_RELEASE: - event->key.device = device; - break; - - case CLUTTER_TOUCHPAD_PINCH: - case CLUTTER_TOUCHPAD_SWIPE: - case CLUTTER_TOUCHPAD_HOLD: - /* Rely on priv data for these */ - break; - - case CLUTTER_PROXIMITY_IN: - case CLUTTER_PROXIMITY_OUT: - event->proximity.device = device; - break; - - case CLUTTER_PAD_BUTTON_PRESS: - case CLUTTER_PAD_BUTTON_RELEASE: - event->pad_button.device = device; - break; - - case CLUTTER_PAD_STRIP: - event->pad_strip.device = device; - break; - - case CLUTTER_PAD_RING: - event->pad_ring.device = device; - break; - - case CLUTTER_DEVICE_ADDED: - case CLUTTER_DEVICE_REMOVED: - event->device.device = device; - break; - } -} - /** * clutter_event_get_device: * @event: a #ClutterEvent @@ -1039,24 +618,6 @@ clutter_event_get_device (const ClutterEvent *event) return device; } -/** - * clutter_event_set_device_tool: - * @event: a #ClutterEvent - * @tool: (nullable): a #ClutterInputDeviceTool - * - * Sets the tool in use for this event8 - **/ -void -clutter_event_set_device_tool (ClutterEvent *event, - ClutterInputDeviceTool *tool) -{ - ClutterEventPrivate *real_event = (ClutterEventPrivate *) event; - - g_return_if_fail (event != NULL); - - real_event->tool = tool; -} - /** * clutter_event_get_device_tool: * @event: a #ClutterEvent @@ -1380,28 +941,6 @@ clutter_event_get_source_device (const ClutterEvent *event) return clutter_event_get_device (event); } -/** - * clutter_event_set_source_device: - * @event: a #ClutterEvent - * @device: (allow-none): a #ClutterInputDevice - * - * Sets the source #ClutterInputDevice for @event. - * - * The #ClutterEvent must have been created using clutter_event_new(). - */ -void -clutter_event_set_source_device (ClutterEvent *event, - ClutterInputDevice *device) -{ - ClutterEventPrivate *real_event; - - g_return_if_fail (event != NULL); - g_return_if_fail (device == NULL || CLUTTER_IS_INPUT_DEVICE (device)); - - real_event = (ClutterEventPrivate *) event; - g_set_object (&real_event->source_device, device); -} - /** * clutter_event_get_axes: * @event: a #ClutterEvent diff --git a/clutter/clutter/clutter-event.h b/clutter/clutter/clutter-event.h index 265faf407..a81e0628a 100644 --- a/clutter/clutter/clutter-event.h +++ b/clutter/clutter/clutter-event.h @@ -618,50 +618,25 @@ void clutter_event_free (ClutterEvent CLUTTER_EXPORT ClutterEventType clutter_event_type (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_flags (ClutterEvent *event, - ClutterEventFlags flags); -CLUTTER_EXPORT ClutterEventFlags clutter_event_get_flags (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_time (ClutterEvent *event, - guint32 time_); -CLUTTER_EXPORT guint32 clutter_event_get_time (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_state (ClutterEvent *event, - ClutterModifierType state); -CLUTTER_EXPORT ClutterModifierType clutter_event_get_state (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_device (ClutterEvent *event, - ClutterInputDevice *device); -CLUTTER_EXPORT ClutterInputDevice * clutter_event_get_device (const ClutterEvent *event); -CLUTTER_EXPORT -void clutter_event_set_source_device (ClutterEvent *event, - ClutterInputDevice *device); CLUTTER_EXPORT ClutterInputDevice * clutter_event_get_source_device (const ClutterEvent *event); -CLUTTER_EXPORT -void clutter_event_set_device_tool (ClutterEvent *event, - ClutterInputDeviceTool *tool); CLUTTER_EXPORT ClutterInputDeviceTool *clutter_event_get_device_tool (const ClutterEvent *event); -CLUTTER_DEPRECATED_FOR(clutter_stage_get_event_actor) -void clutter_event_set_source (ClutterEvent *event, - ClutterActor *actor); CLUTTER_DEPRECATED ClutterActor * clutter_event_get_source (const ClutterEvent *event); CLUTTER_EXPORT ClutterInputDeviceType clutter_event_get_device_type (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_coords (ClutterEvent *event, - gfloat x, - gfloat y); -CLUTTER_EXPORT void clutter_event_get_coords (const ClutterEvent *event, gfloat *x, gfloat *y); @@ -684,40 +659,18 @@ gboolean clutter_event_has_control_modifier (const ClutterEv CLUTTER_EXPORT gboolean clutter_event_is_pointer_emulated (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_key_symbol (ClutterEvent *event, - guint key_sym); -CLUTTER_EXPORT guint clutter_event_get_key_symbol (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_key_code (ClutterEvent *event, - guint16 key_code); -CLUTTER_EXPORT guint16 clutter_event_get_key_code (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_key_unicode (ClutterEvent *event, - gunichar key_unicode); -CLUTTER_EXPORT gunichar clutter_event_get_key_unicode (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_button (ClutterEvent *event, - guint32 button); -CLUTTER_EXPORT guint32 clutter_event_get_button (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_related (ClutterEvent *event, - ClutterActor *actor); -CLUTTER_EXPORT ClutterActor * clutter_event_get_related (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_scroll_direction (ClutterEvent *event, - ClutterScrollDirection direction); -CLUTTER_EXPORT ClutterScrollDirection clutter_event_get_scroll_direction (const ClutterEvent *event); CLUTTER_EXPORT -void clutter_event_set_scroll_delta (ClutterEvent *event, - gdouble dx, - gdouble dy); -CLUTTER_EXPORT void clutter_event_get_scroll_delta (const ClutterEvent *event, gdouble *dx, gdouble *dy);