Skip to content

clutter-event.c: Add fields for unaccelerated delta motion to touchpad events. #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtwebster merged 2 commits into from
Jan 27, 2026
Merged

clutter-event.c: Add fields for unaccelerated delta motion to touchpad events. #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c03b4cf
clutter-event.c: Add fields for unaccelerated delta motion to
mtwebster Jan 21, 2026
293b194
debian/libmuffin0.symbols: Make dpkg-gensymbols happy.
mtwebster Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions clutter/clutter/clutter-event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2213,6 +2213,51 @@ clutter_event_get_gesture_motion_delta (const ClutterEvent *event,
}
}

/**
* clutter_event_get_gesture_motion_delta_unaccelerated:
* @event: A clutter touchpad gesture event
* @dx: (out) (allow-none): the unaccelerated displacement relative to the pointer
* position in the X axis, or %NULL
* @dy: (out) (allow-none): the unaccelerated displacement relative to the pointer
* position in the Y axis, or %NULL
*
* Returns the unaccelerated gesture motion deltas relative to the current
* pointer position. Unlike clutter_event_get_gesture_motion_delta(),
* pointer acceleration is ignored.
**/
void
clutter_event_get_gesture_motion_delta_unaccelerated (const ClutterEvent *event,
gdouble *dx,
gdouble *dy)
{
g_return_if_fail (event != NULL);
g_return_if_fail (event->type == CLUTTER_TOUCHPAD_PINCH ||
event->type == CLUTTER_TOUCHPAD_SWIPE ||
event->type == CLUTTER_TOUCHPAD_HOLD);

if (event->type == CLUTTER_TOUCHPAD_PINCH)
{
if (dx)
*dx = event->touchpad_pinch.dx_unaccel;
if (dy)
*dy = event->touchpad_pinch.dy_unaccel;
}
else if (event->type == CLUTTER_TOUCHPAD_SWIPE)
{
if (dx)
*dx = event->touchpad_swipe.dx_unaccel;
if (dy)
*dy = event->touchpad_swipe.dy_unaccel;
}
else if (event->type == CLUTTER_TOUCHPAD_HOLD)
{
if (dx)
*dx = 0;
if (dy)
*dy = 0;
}
}

/**
* clutter_event_get_scroll_source:
* @event: an scroll event
Expand Down
9 changes: 9 additions & 0 deletions clutter/clutter/clutter-event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ struct _ClutterTouchpadPinchEvent
gfloat y;
gfloat dx;
gfloat dy;
gfloat dx_unaccel;
gfloat dy_unaccel;
gfloat angle_delta;
gfloat scale;
guint n_fingers;
Expand Down Expand Up @@ -499,6 +501,8 @@ struct _ClutterTouchpadSwipeEvent
gfloat y;
gfloat dx;
gfloat dy;
gfloat dx_unaccel;
gfloat dy_unaccel;
};

/**
Expand Down Expand Up @@ -840,6 +844,11 @@ void clutter_event_get_gesture_motion_delta (const Clut
gdouble *dx,
gdouble *dy);

CLUTTER_EXPORT
void clutter_event_get_gesture_motion_delta_unaccelerated (const ClutterEvent *event,
gdouble *dx,
gdouble *dy);

CLUTTER_EXPORT
ClutterScrollSource clutter_event_get_scroll_source (const ClutterEvent *event);

Expand Down
1 change: 1 addition & 0 deletions debian/libmuffin0.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ libmuffin-clutter-0.so.0 libmuffin0 #MINVER#
clutter_event_get_event_sequence@Base 5.3.0
clutter_event_get_flags@Base 5.3.0
clutter_event_get_gesture_motion_delta@Base 5.3.0
clutter_event_get_gesture_motion_delta_unaccelerated@Base 6.7.0
clutter_event_get_gesture_phase@Base 5.3.0
clutter_event_get_gesture_pinch_angle_delta@Base 5.3.0
clutter_event_get_gesture_pinch_scale@Base 5.3.0
Expand Down
28 changes: 21 additions & 7 deletions src/backends/native/meta-seat-native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,8 @@ notify_pinch_gesture_event (ClutterInputDevice *input_device,
uint64_t time_us,
double dx,
double dy,
double dx_unaccel,
double dy_unaccel,
double angle_delta,
double scale,
uint32_t n_fingers)
Expand Down Expand Up @@ -1037,6 +1039,8 @@ notify_pinch_gesture_event (ClutterInputDevice *input_device,
event->touchpad_pinch.y = pos.y;
event->touchpad_pinch.dx = dx;
event->touchpad_pinch.dy = dy;
event->touchpad_pinch.dx_unaccel = dx_unaccel;
event->touchpad_pinch.dy_unaccel = dy_unaccel;
event->touchpad_pinch.angle_delta = angle_delta;
event->touchpad_pinch.scale = scale;
event->touchpad_pinch.n_fingers = n_fingers;
Expand All @@ -1055,7 +1059,9 @@ notify_swipe_gesture_event (ClutterInputDevice *input_device,
uint64_t time_us,
uint32_t n_fingers,
double dx,
double dy)
double dy,
double dx_unaccel,
double dy_unaccel)
{
MetaInputDeviceNative *device_evdev;
MetaSeatNative *seat;
Expand Down Expand Up @@ -1084,6 +1090,8 @@ notify_swipe_gesture_event (ClutterInputDevice *input_device,
event->touchpad_swipe.y = pos.y;
event->touchpad_swipe.dx = dx;
event->touchpad_swipe.dy = dy;
event->touchpad_swipe.dx_unaccel = dx_unaccel;
event->touchpad_swipe.dy_unaccel = dy_unaccel;
event->touchpad_swipe.n_fingers = n_fingers;

meta_xkb_translate_state (event, seat->xkb, seat->button_state);
Expand Down Expand Up @@ -2164,14 +2172,14 @@ process_device_event (MetaSeatNative *seat,
n_fingers = libinput_event_gesture_get_finger_count (gesture_event);
device = libinput_device_get_user_data (libinput_device);
time_us = libinput_event_gesture_get_time_usec (gesture_event);
notify_pinch_gesture_event (device, phase, time_us, 0, 0, 0, 0, n_fingers);
notify_pinch_gesture_event (device, phase, time_us, 0, 0, 0, 0, 0, 0, n_fingers);
break;
}
case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
{
struct libinput_event_gesture *gesture_event =
libinput_event_get_gesture_event (event);
gdouble angle_delta, scale, dx, dy;
gdouble angle_delta, scale, dx, dy, dx_unaccel, dy_unaccel;
uint32_t n_fingers;
uint64_t time_us;

Expand All @@ -2182,10 +2190,13 @@ process_device_event (MetaSeatNative *seat,
scale = libinput_event_gesture_get_scale (gesture_event);
dx = libinput_event_gesture_get_dx (gesture_event);
dy = libinput_event_gesture_get_dy (gesture_event);
dx_unaccel = libinput_event_gesture_get_dx_unaccelerated (gesture_event);
dy_unaccel = libinput_event_gesture_get_dy_unaccelerated (gesture_event);

notify_pinch_gesture_event (device,
CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE,
time_us, dx, dy, angle_delta, scale, n_fingers);
time_us, dx, dy, dx_unaccel, dy_unaccel,
angle_delta, scale, n_fingers);
break;
}
case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
Expand All @@ -2207,7 +2218,7 @@ process_device_event (MetaSeatNative *seat,
phase = libinput_event_gesture_get_cancelled (gesture_event) ?
CLUTTER_TOUCHPAD_GESTURE_PHASE_CANCEL : CLUTTER_TOUCHPAD_GESTURE_PHASE_END;

notify_swipe_gesture_event (device, phase, time_us, n_fingers, 0, 0);
notify_swipe_gesture_event (device, phase, time_us, n_fingers, 0, 0, 0, 0);
break;
}
case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
Expand All @@ -2216,17 +2227,20 @@ process_device_event (MetaSeatNative *seat,
libinput_event_get_gesture_event (event);
uint32_t n_fingers;
uint64_t time_us;
double dx, dy;
double dx, dy, dx_unaccel, dy_unaccel;

device = libinput_device_get_user_data (libinput_device);
time_us = libinput_event_gesture_get_time_usec (gesture_event);
n_fingers = libinput_event_gesture_get_finger_count (gesture_event);
dx = libinput_event_gesture_get_dx (gesture_event);
dy = libinput_event_gesture_get_dy (gesture_event);
dx_unaccel = libinput_event_gesture_get_dx_unaccelerated (gesture_event);
dy_unaccel = libinput_event_gesture_get_dy_unaccelerated (gesture_event);

notify_swipe_gesture_event (device,
CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE,
time_us, n_fingers, dx, dy);
time_us, n_fingers, dx, dy,
dx_unaccel, dy_unaccel);
break;
}
case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
Expand Down
Loading