From e736b04deb90e96e3dd3c6ea8d24d43f32031789 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 25 Feb 2022 16:16:40 +0100 Subject: [PATCH] clutter: Remove "source" event union fields These are no longer used, drop the last places that modify those in event structs and remove them. Part-of: --- clutter/clutter/clutter-event.h | 16 ---------------- clutter/clutter/clutter-stage.c | 1 - src/backends/x11/meta-seat-x11.c | 2 -- src/tests/clutter/conform/actor-event-hold.c | 1 - src/tests/clutter/conform/binding-pool.c | 1 - src/tests/clutter/performance/test-common.h | 1 - 6 files changed, 22 deletions(-) diff --git a/clutter/clutter/clutter-event.h b/clutter/clutter/clutter-event.h index 49b86247b..5a8e3c116 100644 --- a/clutter/clutter/clutter-event.h +++ b/clutter/clutter/clutter-event.h @@ -141,7 +141,6 @@ struct _ClutterAnyEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; }; /** @@ -168,7 +167,6 @@ struct _ClutterKeyEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterModifierType modifier_state; guint keyval; @@ -207,7 +205,6 @@ struct _ClutterButtonEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; gfloat x; gfloat y; @@ -238,7 +235,6 @@ struct _ClutterProximityEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterInputDevice *device; }; @@ -265,7 +261,6 @@ struct _ClutterCrossingEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; gfloat x; gfloat y; @@ -298,7 +293,6 @@ struct _ClutterMotionEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; gfloat x; gfloat y; @@ -340,7 +334,6 @@ struct _ClutterScrollEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; gfloat x; gfloat y; @@ -390,7 +383,6 @@ struct _ClutterTouchEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; gfloat x; gfloat y; @@ -436,7 +428,6 @@ struct _ClutterTouchpadPinchEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterTouchpadGesturePhase phase; gfloat x; @@ -479,7 +470,6 @@ struct _ClutterTouchpadSwipeEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterTouchpadGesturePhase phase; guint n_fingers; @@ -519,7 +509,6 @@ struct _ClutterTouchpadHoldEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterTouchpadGesturePhase phase; uint32_t n_fingers; @@ -533,7 +522,6 @@ struct _ClutterPadButtonEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; guint32 button; guint32 group; @@ -547,7 +535,6 @@ struct _ClutterPadStripEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterInputDevice *device; ClutterInputDevicePadSource strip_source; @@ -563,7 +550,6 @@ struct _ClutterPadRingEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterInputDevice *device; ClutterInputDevicePadSource ring_source; @@ -579,7 +565,6 @@ struct _ClutterDeviceEvent guint32 time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; ClutterInputDevice *device; }; @@ -590,7 +575,6 @@ struct _ClutterIMEvent uint32_t time; ClutterEventFlags flags; ClutterStage *stage; - ClutterActor *source; char *text; int32_t offset; diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 09a56e8a7..569df87a7 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -3400,7 +3400,6 @@ create_crossing_event (ClutterStage *stage, event->crossing.time = time_ms; event->crossing.flags = flags; event->crossing.stage = stage; - event->crossing.source = source; event->crossing.x = coords.x; event->crossing.y = coords.y; event->crossing.related = related; diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c index 34b9bacc8..c8e690faa 100644 --- a/src/backends/x11/meta-seat-x11.c +++ b/src/backends/x11/meta-seat-x11.c @@ -2444,7 +2444,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, event->crossing.type = event->type = CLUTTER_ENTER; event->crossing.stage = stage; - event->crossing.source = CLUTTER_ACTOR (stage); event->crossing.related = NULL; event->crossing.time = xev->time; @@ -2458,7 +2457,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, event->crossing.type = event->type = CLUTTER_LEAVE; event->crossing.stage = stage; - event->crossing.source = CLUTTER_ACTOR (stage); event->crossing.related = NULL; event->crossing.time = xev->time; diff --git a/src/tests/clutter/conform/actor-event-hold.c b/src/tests/clutter/conform/actor-event-hold.c index 1635cf7b4..aa3b1be7b 100644 --- a/src/tests/clutter/conform/actor-event-hold.c +++ b/src/tests/clutter/conform/actor-event-hold.c @@ -102,7 +102,6 @@ actor_event_hold (void) event->touchpad_hold.time = EVENT_TIME; event->touchpad_hold.n_fingers = test_case->n_fingers; event->touchpad_hold.stage = (ClutterStage *) stage; - event->touchpad_hold.source = stage; clutter_event_set_coords (event, test_case->x, test_case->y); clutter_event_set_device (event, device); diff --git a/src/tests/clutter/conform/binding-pool.c b/src/tests/clutter/conform/binding-pool.c index a14ea573e..8644643f5 100644 --- a/src/tests/clutter/conform/binding-pool.c +++ b/src/tests/clutter/conform/binding-pool.c @@ -231,7 +231,6 @@ init_event (ClutterKeyEvent *event) event->time = 0; /* not needed */ event->flags = CLUTTER_EVENT_FLAG_SYNTHETIC; event->stage = NULL; /* not needed */ - event->source = NULL; /* not needed */ event->modifier_state = 0; event->hardware_keycode = 0; /* not needed */ } diff --git a/src/tests/clutter/performance/test-common.h b/src/tests/clutter/performance/test-common.h index ea4210ddc..00959fe8b 100644 --- a/src/tests/clutter/performance/test-common.h +++ b/src/tests/clutter/performance/test-common.h @@ -104,7 +104,6 @@ static gboolean perf_fake_mouse_cb (gpointer stage) device = clutter_seat_get_pointer (seat); event2->crossing.stage = stage; - event2->crossing.source = stage; event2->crossing.x = 10; event2->crossing.y = 10; event2->crossing.related = NULL;