mirror of
https://github.com/brl/mutter.git
synced 2025-02-02 14:53:03 +00:00
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2311>
This commit is contained in:
parent
2aeaeece7d
commit
e736b04deb
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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 */
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user