diff --git a/src/libeis-event.c b/src/libeis-event.c index aeae6a2..8fa149b 100644 --- a/src/libeis-event.c +++ b/src/libeis-event.c @@ -133,7 +133,7 @@ check_event_type(struct eis_event *event, return retval_; \ _public_ double -eis_event_pointer_get_x(struct eis_event *event) +eis_event_pointer_get_dx(struct eis_event *event) { require_event_type(event, 0.0, EIS_EVENT_POINTER_MOTION, @@ -142,11 +142,11 @@ eis_event_pointer_get_x(struct eis_event *event) EIS_EVENT_POINTER_SCROLL, EIS_EVENT_POINTER_SCROLL_DISCRETE); - return event->pointer.x; + return event->pointer.dx; } _public_ double -eis_event_pointer_get_y(struct eis_event *event) +eis_event_pointer_get_dy(struct eis_event *event) { require_event_type(event, 0.0, EIS_EVENT_POINTER_MOTION, @@ -155,7 +155,7 @@ eis_event_pointer_get_y(struct eis_event *event) EIS_EVENT_POINTER_SCROLL, EIS_EVENT_POINTER_SCROLL_DISCRETE); - return event->pointer.y; + return event->pointer.dy; } _public_ uint32_t diff --git a/src/libeis-private.h b/src/libeis-private.h index 0825bda..8043231 100644 --- a/src/libeis-private.h +++ b/src/libeis-private.h @@ -103,7 +103,7 @@ struct eis_event { union { struct { - int x, y; /* relative motion */ + int dx, dy; /* relative motion */ uint32_t button; bool button_is_press; } pointer; diff --git a/src/libeis.c b/src/libeis.c index 906dc23..7542ea8 100644 --- a/src/libeis.c +++ b/src/libeis.c @@ -139,12 +139,12 @@ eis_queue_removed_event(struct eis_device *device) void eis_queue_pointer_rel_event(struct eis_device *device, - double x, double y) + double dx, double dy) { struct eis_event *e = eis_event_new_for_device(device); e->type = EIS_EVENT_POINTER_MOTION; - e->pointer.x = x; - e->pointer.y = y; + e->pointer.dx = dx; + e->pointer.dy = dy; eis_queue_event(e); } diff --git a/src/libeis.h b/src/libeis.h index d5c5867..fadfb00 100644 --- a/src/libeis.h +++ b/src/libeis.h @@ -426,18 +426,18 @@ struct eis_device * eis_event_get_device(struct eis_event *event); /** - * For an event of type @ref EIS_EVENT_POINTER_MOTION return the x movement - * in logical pixels. + * For an event of type @ref EIS_EVENT_POINTER_MOTION return the relative x + * movement in logical pixels. */ double -eis_event_pointer_get_x(struct eis_event *event); +eis_event_pointer_get_dx(struct eis_event *event); /** - * For an event of type @ref EIS_EVENT_POINTER_MOTION return the y movement - * in logical pixels. + * For an event of type @ref EIS_EVENT_POINTER_MOTION return the relative y + * movement in logical pixels. */ double -eis_event_pointer_get_y(struct eis_event *event); +eis_event_pointer_get_dy(struct eis_event *event); /** * For an event of type @ref EIS_EVENT_POINTER_MOTION_ABSOLUTE return the x diff --git a/tools/eis-socket-server.c b/tools/eis-socket-server.c index f519091..fcbb355 100644 --- a/tools/eis-socket-server.c +++ b/tools/eis-socket-server.c @@ -127,8 +127,8 @@ int main(int argc, char **argv) case EIS_EVENT_POINTER_MOTION: { printf("server: motion by %.2f/%.2f\n", - eis_event_pointer_get_x(e), - eis_event_pointer_get_y(e)); + eis_event_pointer_get_dx(e), + eis_event_pointer_get_dy(e)); } break; case EIS_EVENT_POINTER_BUTTON: