isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-13 06:45:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Remove "source" event union fields

Browse Source 
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:
Carlos Garnacho 2022-02-25 16:16:40 +01:00 committed by Marge Bot
parent 2aeaeece7d
commit e736b04deb
6 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter/clutter-event.h
View File

@ -141,7 +141,6 @@ struct _ClutterAnyEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
}; };
/** /**
@ -168,7 +167,6 @@ struct _ClutterKeyEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
guint keyval; guint keyval;
@ -207,7 +205,6 @@ struct _ClutterButtonEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
gfloat x; gfloat x;
gfloat y; gfloat y;
@ -238,7 +235,6 @@ struct _ClutterProximityEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterInputDevice *device; ClutterInputDevice *device;
}; };
@ -265,7 +261,6 @@ struct _ClutterCrossingEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
gfloat x; gfloat x;
gfloat y; gfloat y;
@ -298,7 +293,6 @@ struct _ClutterMotionEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
gfloat x; gfloat x;
gfloat y; gfloat y;
@ -340,7 +334,6 @@ struct _ClutterScrollEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
gfloat x; gfloat x;
gfloat y; gfloat y;
@ -390,7 +383,6 @@ struct _ClutterTouchEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
gfloat x; gfloat x;
gfloat y; gfloat y;
@ -436,7 +428,6 @@ struct _ClutterTouchpadPinchEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterTouchpadGesturePhase phase; ClutterTouchpadGesturePhase phase;
gfloat x; gfloat x;
@ -479,7 +470,6 @@ struct _ClutterTouchpadSwipeEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterTouchpadGesturePhase phase; ClutterTouchpadGesturePhase phase;
guint n_fingers; guint n_fingers;
@ -519,7 +509,6 @@ struct _ClutterTouchpadHoldEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterTouchpadGesturePhase phase; ClutterTouchpadGesturePhase phase;
uint32_t n_fingers; uint32_t n_fingers;
@ -533,7 +522,6 @@ struct _ClutterPadButtonEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
guint32 button; guint32 button;
guint32 group; guint32 group;
@ -547,7 +535,6 @@ struct _ClutterPadStripEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevicePadSource strip_source; ClutterInputDevicePadSource strip_source;
@ -563,7 +550,6 @@ struct _ClutterPadRingEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevicePadSource ring_source; ClutterInputDevicePadSource ring_source;
@ -579,7 +565,6 @@ struct _ClutterDeviceEvent
guint32 time; guint32 time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
ClutterInputDevice *device; ClutterInputDevice *device;
}; };
@ -590,7 +575,6 @@ struct _ClutterIMEvent
uint32_t time; uint32_t time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterStage *stage; ClutterStage *stage;
ClutterActor *source;
char *text; char *text;
int32_t offset; int32_t offset;

1
clutter/clutter/clutter-stage.c
View File

@ -3400,7 +3400,6 @@ create_crossing_event (ClutterStage *stage,
event->crossing.time = time_ms; event->crossing.time = time_ms;
event->crossing.flags = flags; event->crossing.flags = flags;
event->crossing.stage = stage; event->crossing.stage = stage;
event->crossing.source = source;
event->crossing.x = coords.x; event->crossing.x = coords.x;
event->crossing.y = coords.y; event->crossing.y = coords.y;
event->crossing.related = related; event->crossing.related = related;

2
src/backends/x11/meta-seat-x11.c
View File

@ -2444,7 +2444,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
event->crossing.type = event->type = CLUTTER_ENTER; event->crossing.type = event->type = CLUTTER_ENTER;
event->crossing.stage = stage; event->crossing.stage = stage;
event->crossing.source = CLUTTER_ACTOR (stage);
event->crossing.related = NULL; event->crossing.related = NULL;
event->crossing.time = xev->time; 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.type = event->type = CLUTTER_LEAVE;
event->crossing.stage = stage; event->crossing.stage = stage;
event->crossing.source = CLUTTER_ACTOR (stage);
event->crossing.related = NULL; event->crossing.related = NULL;
event->crossing.time = xev->time; event->crossing.time = xev->time;

1
src/tests/clutter/conform/actor-event-hold.c
View File

@ -102,7 +102,6 @@ actor_event_hold (void)
event->touchpad_hold.time = EVENT_TIME; event->touchpad_hold.time = EVENT_TIME;
event->touchpad_hold.n_fingers = test_case->n_fingers; event->touchpad_hold.n_fingers = test_case->n_fingers;
event->touchpad_hold.stage = (ClutterStage *) stage; 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_coords (event, test_case->x, test_case->y);
clutter_event_set_device (event, device); clutter_event_set_device (event, device);

1
src/tests/clutter/conform/binding-pool.c
View File

@ -231,7 +231,6 @@ init_event (ClutterKeyEvent *event)
event->time = 0; /* not needed */ event->time = 0; /* not needed */
event->flags = CLUTTER_EVENT_FLAG_SYNTHETIC; event->flags = CLUTTER_EVENT_FLAG_SYNTHETIC;
event->stage = NULL; /* not needed */ event->stage = NULL; /* not needed */
event->source = NULL; /* not needed */
event->modifier_state = 0; event->modifier_state = 0;
event->hardware_keycode = 0; /* not needed */ event->hardware_keycode = 0; /* not needed */
} }

1
src/tests/clutter/performance/test-common.h
View File

@ -104,7 +104,6 @@ static gboolean perf_fake_mouse_cb (gpointer stage)
device = clutter_seat_get_pointer (seat); device = clutter_seat_get_pointer (seat);
event2->crossing.stage = stage; event2->crossing.stage = stage;
event2->crossing.source = stage;
event2->crossing.x = 10; event2->crossing.x = 10;
event2->crossing.y = 10; event2->crossing.y = 10;
event2->crossing.related = NULL; event2->crossing.related = NULL;