isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-03 21:30:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Move tool to specific event structs

Browse Source 
Move this field out of ClutterEventPrivate, and into the specific
event structs.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3190>
This commit is contained in:
Carlos Garnacho 2023-08-17 14:34:59 +02:00 committed by Marge Bot
parent c1fc359e76
commit 7d90338d29
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
clutter/clutter/clutter-event.c
View File

@ -65,8 +65,9 @@ struct _ClutterButtonEvent
float y; float y;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
uint32_t button; uint32_t button;
double *axes; /* Future use */ double *axes;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDeviceTool *tool;
uint32_t evdev_code; uint32_t evdev_code;
}; };
@ -76,6 +77,7 @@ struct _ClutterProximityEvent
uint32_t time; uint32_t time;
ClutterEventFlags flags; ClutterEventFlags flags;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDeviceTool *tool;
}; };
struct _ClutterCrossingEvent struct _ClutterCrossingEvent
@ -101,8 +103,9 @@ struct _ClutterMotionEvent
float x; float x;
float y; float y;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
double *axes; /* Future use */ double *axes;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDeviceTool *tool;
int64_t time_us; int64_t time_us;
double dx; double dx;
@ -125,8 +128,9 @@ struct _ClutterScrollEvent
double delta_y; double delta_y;
ClutterScrollDirection direction; ClutterScrollDirection direction;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
double *axes; /* future use */ double *axes;
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDeviceTool *tool;
ClutterScrollSource scroll_source; ClutterScrollSource scroll_source;
ClutterScrollFinishFlags finish_flags; ClutterScrollFinishFlags finish_flags;
}; };
@ -281,8 +285,6 @@ typedef struct _ClutterEventPrivate {
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
ClutterInputDeviceTool *tool;
} ClutterEventPrivate; } ClutterEventPrivate;
typedef struct _ClutterEventFilter { typedef struct _ClutterEventFilter {
@ -840,11 +842,23 @@ clutter_event_get_device (const ClutterEvent *event)
ClutterInputDeviceTool * ClutterInputDeviceTool *
clutter_event_get_device_tool (const ClutterEvent *event) clutter_event_get_device_tool (const ClutterEvent *event)
{ {
ClutterEventPrivate *real_event = (ClutterEventPrivate *) event;
g_return_val_if_fail (event != NULL, NULL); g_return_val_if_fail (event != NULL, NULL);
return real_event->tool; switch (event->any.type)
{
case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE:
return event->button.tool;
case CLUTTER_MOTION:
return event->motion.tool;
case CLUTTER_SCROLL:
return event->scroll.tool;
case CLUTTER_PROXIMITY_IN:
case CLUTTER_PROXIMITY_OUT:
return event->proximity.tool;
default:
return NULL;
}
} }
/** /**
@ -893,7 +907,6 @@ clutter_event_copy (const ClutterEvent *event)
g_set_object (&new_real_event->device, real_event->device); g_set_object (&new_real_event->device, real_event->device);
g_set_object (&new_real_event->source_device, real_event->source_device); g_set_object (&new_real_event->source_device, real_event->source_device);
new_real_event->tool = real_event->tool;
switch (event->type) switch (event->type)
{ {
@ -1959,9 +1972,9 @@ clutter_event_button_new (ClutterEventType type,
event->button.button = button; event->button.button = button;
event->button.axes = axes; event->button.axes = axes;
event->button.evdev_code = evcode; event->button.evdev_code = evcode;
event->button.tool = tool;
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool;
if (tool) if (tool)
{ {
@ -2012,9 +2025,9 @@ clutter_event_motion_new (ClutterEventFlags flags,
event->motion.dy_unaccel = delta_unaccel.y; event->motion.dy_unaccel = delta_unaccel.y;
event->motion.dx_constrained = delta_constrained.x; event->motion.dx_constrained = delta_constrained.x;
event->motion.dy_constrained = delta_constrained.y; event->motion.dy_constrained = delta_constrained.y;
event->motion.tool = tool;
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool;
if (tool) if (tool)
{ {
@ -2061,9 +2074,9 @@ clutter_event_scroll_smooth_new (ClutterEventFlags flags,
event->scroll.modifier_state = modifiers; event->scroll.modifier_state = modifiers;
event->scroll.scroll_source = scroll_source; event->scroll.scroll_source = scroll_source;
event->scroll.finish_flags = finish_flags; event->scroll.finish_flags = finish_flags;
event->scroll.tool = tool;
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool;
if (tool) if (tool)
{ {
@ -2104,9 +2117,9 @@ clutter_event_scroll_discrete_new (ClutterEventFlags flags,
event->scroll.y = coords.y; event->scroll.y = coords.y;
event->scroll.direction = direction; event->scroll.direction = direction;
event->scroll.modifier_state = modifiers; event->scroll.modifier_state = modifiers;
event->scroll.tool = tool;
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool;
if (tool) if (tool)
{ {
@ -2241,9 +2254,9 @@ clutter_event_proximity_new (ClutterEventType type,
event->proximity.time = us2ms (timestamp_us); event->proximity.time = us2ms (timestamp_us);
event->proximity.flags = flags; event->proximity.flags = flags;
event->proximity.device = source_device; event->proximity.device = source_device;
event->proximity.tool = tool;
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool;
return event; return event;
} }