mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

types/wlr_pointer: uniformize events name

Browse source
This commit is contained in:
Simon Zeni 2022-03-09 14:52:27 -05:00 • committed by Kirill Primak
parent 96ccc50c57
commit bd6c000d14
10 changed files with 123 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

48
include/wlr/types/wlr_pointer.h
View file

@ -45,22 +45,22 @@ struct wlr_pointer {
void *data;
};
struct wlr_event_pointer_motion {
struct wlr_input_device *device;
struct wlr_pointer_motion_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
double delta_x, delta_y;
double unaccel_dx, unaccel_dy;
};
struct wlr_event_pointer_motion_absolute {
struct wlr_input_device *device;
struct wlr_pointer_motion_absolute_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
// From 0..1
double x, y;
};
struct wlr_event_pointer_button {
struct wlr_input_device *device;
struct wlr_pointer_button_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t button;
enum wlr_button_state state;
@ -78,8 +78,8 @@ enum wlr_axis_orientation {
WLR_AXIS_ORIENTATION_HORIZONTAL,
};
struct wlr_event_pointer_axis {
struct wlr_input_device *device;
struct wlr_pointer_axis_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
enum wlr_axis_source source;
enum wlr_axis_orientation orientation;
@ -87,14 +87,14 @@ struct wlr_event_pointer_axis {
int32_t delta_discrete;
};
struct wlr_event_pointer_swipe_begin {
struct wlr_input_device *device;
struct wlr_pointer_swipe_begin_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t fingers;
};
struct wlr_event_pointer_swipe_update {
struct wlr_input_device *device;
struct wlr_pointer_swipe_update_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t fingers;
// Relative coordinates of the logical center of the gesture
@ -102,20 +102,20 @@ struct wlr_event_pointer_swipe_update {
double dx, dy;
};
struct wlr_event_pointer_swipe_end {
struct wlr_input_device *device;
struct wlr_pointer_swipe_end_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
bool cancelled;
};
struct wlr_event_pointer_pinch_begin {
struct wlr_input_device *device;
struct wlr_pointer_pinch_begin_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t fingers;
};
struct wlr_event_pointer_pinch_update {
struct wlr_input_device *device;
struct wlr_pointer_pinch_update_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t fingers;
// Relative coordinates of the logical center of the gesture
@ -127,20 +127,20 @@ struct wlr_event_pointer_pinch_update {
double rotation;
};
struct wlr_event_pointer_pinch_end {
struct wlr_input_device *device;
struct wlr_pointer_pinch_end_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
bool cancelled;
};
struct wlr_event_pointer_hold_begin {
struct wlr_input_device *device;
struct wlr_pointer_hold_begin_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
uint32_t fingers;
};
struct wlr_event_pointer_hold_end {
struct wlr_input_device *device;
struct wlr_pointer_hold_end_event {
struct wlr_pointer *pointer;
uint32_t time_msec;
bool cancelled;
};

2
include/wlr/types/wlr_virtual_pointer_v1.h
View file

@ -30,7 +30,7 @@ struct wlr_virtual_pointer_v1 {
struct wlr_pointer pointer;
struct wl_resource *resource;
/* Vertical and horizontal */
struct wlr_event_pointer_axis axis_event[2];
struct wlr_pointer_axis_event axis_event[2];
enum wl_pointer_axis axis;
bool axis_valid[2];