mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -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

22
types/wlr_cursor.c
View file

@ -431,7 +431,7 @@ static struct wlr_output *get_mapped_output(struct wlr_cursor_device *cursor_dev
static void handle_pointer_motion_absolute(struct wl_listener *listener,
void *data) {
struct wlr_event_pointer_motion_absolute *event = data;
struct wlr_pointer_motion_absolute_event *event = data;
struct wlr_cursor_device *device =
wl_container_of(listener, device, motion_absolute);
@ -444,14 +444,14 @@ static void handle_pointer_motion_absolute(struct wl_listener *listener,
}
static void handle_pointer_button(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_button *event = data;
struct wlr_pointer_button_event *event = data;
struct wlr_cursor_device *device =
wl_container_of(listener, device, button);
wlr_signal_emit_safe(&device->cursor->events.button, event);
}
static void handle_pointer_axis(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_axis *event = data;
struct wlr_pointer_axis_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, axis);
wlr_signal_emit_safe(&device->cursor->events.axis, event);
}
@ -462,49 +462,49 @@ static void handle_pointer_frame(struct wl_listener *listener, void *data) {
}
static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_swipe_begin *event = data;
struct wlr_pointer_swipe_begin_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, swipe_begin);
wlr_signal_emit_safe(&device->cursor->events.swipe_begin, event);
}
static void handle_pointer_swipe_update(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_swipe_update *event = data;
struct wlr_pointer_swipe_update_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, swipe_update);
wlr_signal_emit_safe(&device->cursor->events.swipe_update, event);
}
static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_swipe_end *event = data;
struct wlr_pointer_swipe_end_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, swipe_end);
wlr_signal_emit_safe(&device->cursor->events.swipe_end, event);
}
static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_pinch_begin *event = data;
struct wlr_pointer_pinch_begin_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, pinch_begin);
wlr_signal_emit_safe(&device->cursor->events.pinch_begin, event);
}
static void handle_pointer_pinch_update(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_pinch_update *event = data;
struct wlr_pointer_pinch_update_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, pinch_update);
wlr_signal_emit_safe(&device->cursor->events.pinch_update, event);
}
static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_pinch_end *event = data;
struct wlr_pointer_pinch_end_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, pinch_end);
wlr_signal_emit_safe(&device->cursor->events.pinch_end, event);
}
static void handle_pointer_hold_begin(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_hold_begin *event = data;
struct wlr_pointer_hold_begin_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, hold_begin);
wlr_signal_emit_safe(&device->cursor->events.hold_begin, event);
}
static void handle_pointer_hold_end(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_hold_end *event = data;
struct wlr_pointer_hold_end_event *event = data;
struct wlr_cursor_device *device = wl_container_of(listener, device, hold_end);
wlr_signal_emit_safe(&device->cursor->events.hold_end, event);
}

31
types/wlr_virtual_pointer_v1.c
View file

@ -29,9 +29,8 @@ static void virtual_pointer_motion(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_motion event = {
.device = wlr_dev,
struct wlr_pointer_motion_event event = {
.pointer = &pointer->pointer,
.time_msec = time,
.delta_x = wl_fixed_to_double(dx),
.delta_y = wl_fixed_to_double(dy),
@ -52,14 +51,13 @@ static void virtual_pointer_motion_absolute(struct wl_client *client,
if (x_extent == 0 || y_extent == 0) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_motion_absolute event = {
.device = wlr_dev,
struct wlr_pointer_motion_absolute_event event = {
.pointer = &pointer->pointer,
.time_msec = time,
.x = (double)x / x_extent,
.y = (double)y / y_extent,
};
wlr_signal_emit_safe(&wlr_dev->pointer->events.motion_absolute, &event);
wlr_signal_emit_safe(&pointer->pointer.events.motion_absolute, &event);
}
static void virtual_pointer_button(struct wl_client *client,
@ -70,14 +68,13 @@ static void virtual_pointer_button(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
struct wlr_event_pointer_button event = {
.device = wlr_dev,
struct wlr_pointer_button_event event = {
.pointer = &pointer->pointer,
.time_msec = time,
.button = button,
.state = state ? WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED
};
wlr_signal_emit_safe(&wlr_dev->pointer->events.button, &event);
wlr_signal_emit_safe(&pointer->pointer.events.button, &event);
}
static void virtual_pointer_axis(struct wl_client *client,
@ -94,10 +91,9 @@ static void virtual_pointer_axis(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
pointer->axis_event[pointer->axis].pointer = &pointer->pointer;
pointer->axis_event[pointer->axis].time_msec = time;
pointer->axis_event[pointer->axis].orientation = axis;
pointer->axis_event[pointer->axis].delta = wl_fixed_to_double(value);
@ -140,8 +136,7 @@ static void virtual_pointer_axis_source(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis_event[pointer->axis].device = wlr_dev;
pointer->axis_event[pointer->axis].pointer = &pointer->pointer;
pointer->axis_event[pointer->axis].source = source;
}
@ -158,10 +153,9 @@ static void virtual_pointer_axis_stop(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
pointer->axis_event[pointer->axis].pointer = &pointer->pointer;
pointer->axis_event[pointer->axis].time_msec = time;
pointer->axis_event[pointer->axis].orientation = axis;
pointer->axis_event[pointer->axis].delta = 0;
@ -182,10 +176,9 @@ static void virtual_pointer_axis_discrete(struct wl_client *client,
if (pointer == NULL) {
return;
}
struct wlr_input_device *wlr_dev = &pointer->pointer.base;
pointer->axis = axis;
pointer->axis_valid[pointer->axis] = true;
pointer->axis_event[pointer->axis].device = wlr_dev;
pointer->axis_event[pointer->axis].pointer = &pointer->pointer;
pointer->axis_event[pointer->axis].time_msec = time;
pointer->axis_event[pointer->axis].orientation = axis;
pointer->axis_event[pointer->axis].delta = wl_fixed_to_double(value);