nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pointer: drop enum wlr_axis_source

Browse Source 
Instead, use enum wl_pointer_axis_source from the Wayland protocol.
This commit is contained in:
Simon Ser 2024-02-28 10:15:13 +01:00 committed by Simon Zeni
parent c45e97f3a5
commit 9f4cf242d9
10 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/libinput/events.c
View File

@ -180,15 +180,15 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
#if HAVE_LIBINPUT_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL: case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL:
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WLR_AXIS_SOURCE_WHEEL); WL_POINTER_AXIS_SOURCE_WHEEL);
break; break;
case LIBINPUT_EVENT_POINTER_SCROLL_FINGER: case LIBINPUT_EVENT_POINTER_SCROLL_FINGER:
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WLR_AXIS_SOURCE_FINGER); WL_POINTER_AXIS_SOURCE_FINGER);
break; break;
case LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS: case LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS:
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WLR_AXIS_SOURCE_CONTINUOUS); WL_POINTER_AXIS_SOURCE_CONTINUOUS);
break; break;
#endif #endif
case LIBINPUT_EVENT_TOUCH_DOWN: case LIBINPUT_EVENT_TOUCH_DOWN:

12
backend/libinput/pointer.c
View File

@ -95,16 +95,16 @@ void handle_pointer_axis(struct libinput_event *event,
}; };
switch (libinput_event_pointer_get_axis_source(pevent)) { switch (libinput_event_pointer_get_axis_source(pevent)) {
case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL: case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL:
wlr_event.source = WLR_AXIS_SOURCE_WHEEL; wlr_event.source = WL_POINTER_AXIS_SOURCE_WHEEL;
break; break;
case LIBINPUT_POINTER_AXIS_SOURCE_FINGER: case LIBINPUT_POINTER_AXIS_SOURCE_FINGER:
wlr_event.source = WLR_AXIS_SOURCE_FINGER; wlr_event.source = WL_POINTER_AXIS_SOURCE_FINGER;
break; break;
case LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS: case LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS:
wlr_event.source = WLR_AXIS_SOURCE_CONTINUOUS; wlr_event.source = WL_POINTER_AXIS_SOURCE_CONTINUOUS;
break; break;
case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL_TILT: case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL_TILT:
wlr_event.source = WLR_AXIS_SOURCE_WHEEL_TILT; wlr_event.source = WL_POINTER_AXIS_SOURCE_WHEEL_TILT;
break; break;
} }
const enum libinput_pointer_axis axes[] = { const enum libinput_pointer_axis axes[] = {
@ -140,7 +140,7 @@ void handle_pointer_axis(struct libinput_event *event,
#if HAVE_LIBINPUT_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wlr_axis_source source) { struct wlr_pointer *pointer, enum wl_pointer_axis_source source) {
struct libinput_event_pointer *pevent = struct libinput_event_pointer *pevent =
libinput_event_get_pointer_event(event); libinput_event_get_pointer_event(event);
struct wlr_pointer_axis_event wlr_event = { struct wlr_pointer_axis_event wlr_event = {
@ -167,7 +167,7 @@ void handle_pointer_axis_value120(struct libinput_event *event,
} }
wlr_event.delta = wlr_event.delta =
libinput_event_pointer_get_scroll_value(pevent, axes[i]); libinput_event_pointer_get_scroll_value(pevent, axes[i]);
if (source == WLR_AXIS_SOURCE_WHEEL) { if (source == WL_POINTER_AXIS_SOURCE_WHEEL) {
wlr_event.delta_discrete = wlr_event.delta_discrete =
libinput_event_pointer_get_scroll_value_v120(pevent, axes[i]); libinput_event_pointer_get_scroll_value_v120(pevent, axes[i]);
} }

2
backend/x11/input_device.c
View File

@ -45,7 +45,7 @@ static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
struct wlr_pointer_axis_event ev = { struct wlr_pointer_axis_event ev = {
.pointer = &output->pointer, .pointer = &output->pointer,
.time_msec = time, .time_msec = time,
.source = WLR_AXIS_SOURCE_WHEEL, .source = WL_POINTER_AXIS_SOURCE_WHEEL,
.orientation = WLR_AXIS_ORIENTATION_VERTICAL, .orientation = WLR_AXIS_ORIENTATION_VERTICAL,
// Most mice use a 15 degree angle per scroll click // Most mice use a 15 degree angle per scroll click
.delta = delta * 15, .delta = delta * 15,

2
include/backend/libinput.h
View File

@ -72,7 +72,7 @@ void handle_pointer_axis(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
#if HAVE_LIBINPUT_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wlr_axis_source source); struct wlr_pointer *pointer, enum wl_pointer_axis_source source);
#endif #endif
void handle_pointer_swipe_begin(struct libinput_event *event, void handle_pointer_swipe_begin(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);

2
include/backend/wayland.h
View File

@ -106,7 +106,7 @@ struct wlr_wl_pointer {
struct wlr_wl_seat *seat; struct wlr_wl_seat *seat;
struct wlr_wl_output *output; struct wlr_wl_output *output;
enum wlr_axis_source axis_source; enum wl_pointer_axis_source axis_source;
int32_t axis_discrete; int32_t axis_discrete;
uint32_t fingers; // trackpad gesture uint32_t fingers; // trackpad gesture
enum wlr_axis_relative_direction axis_relative_direction; enum wlr_axis_relative_direction axis_relative_direction;

9
include/wlr/types/wlr_pointer.h
View File

@ -66,13 +66,6 @@ struct wlr_pointer_button_event {
enum wlr_button_state state; enum wlr_button_state state;
}; };
enum wlr_axis_source {
WLR_AXIS_SOURCE_WHEEL,
WLR_AXIS_SOURCE_FINGER,
WLR_AXIS_SOURCE_CONTINUOUS,
WLR_AXIS_SOURCE_WHEEL_TILT,
};
enum wlr_axis_orientation { enum wlr_axis_orientation {
WLR_AXIS_ORIENTATION_VERTICAL, WLR_AXIS_ORIENTATION_VERTICAL,
WLR_AXIS_ORIENTATION_HORIZONTAL, WLR_AXIS_ORIENTATION_HORIZONTAL,
@ -88,7 +81,7 @@ enum wlr_axis_relative_direction {
struct wlr_pointer_axis_event { struct wlr_pointer_axis_event {
struct wlr_pointer *pointer; struct wlr_pointer *pointer;
uint32_t time_msec; uint32_t time_msec;
enum wlr_axis_source source; enum wl_pointer_axis_source source;
enum wlr_axis_orientation orientation; enum wlr_axis_orientation orientation;
enum wlr_axis_relative_direction relative_direction; enum wlr_axis_relative_direction relative_direction;
double delta; double delta;

8
include/wlr/types/wlr_seat.h
View File

@ -101,7 +101,7 @@ struct wlr_pointer_grab_interface {
uint32_t button, enum wlr_button_state state); uint32_t button, enum wlr_button_state state);
void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time_msec, void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time_msec,
enum wlr_axis_orientation orientation, double value, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction); enum wlr_axis_relative_direction relative_direction);
void (*frame)(struct wlr_seat_pointer_grab *grab); void (*frame)(struct wlr_seat_pointer_grab *grab);
void (*cancel)(struct wlr_seat_pointer_grab *grab); void (*cancel)(struct wlr_seat_pointer_grab *grab);
@ -182,7 +182,7 @@ struct wlr_seat_pointer_state {
struct wlr_seat_pointer_grab *default_grab; struct wlr_seat_pointer_grab *default_grab;
bool sent_axis_source; bool sent_axis_source;
enum wlr_axis_source cached_axis_source; enum wl_pointer_axis_source cached_axis_source;
uint32_t buttons[WLR_POINTER_BUTTONS_CAP]; uint32_t buttons[WLR_POINTER_BUTTONS_CAP];
size_t button_count; size_t button_count;
@ -408,7 +408,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat,
*/ */
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec,
enum wlr_axis_orientation orientation, double value, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction); enum wlr_axis_relative_direction relative_direction);
/** /**
@ -460,7 +460,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
*/ */
void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time_msec,
enum wlr_axis_orientation orientation, double value, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction); enum wlr_axis_relative_direction relative_direction);
/** /**

2
types/data_device/wlr_drag.c
View File

@ -235,7 +235,7 @@ static uint32_t drag_handle_pointer_button(struct wlr_seat_pointer_grab *grab,
static void drag_handle_pointer_axis(struct wlr_seat_pointer_grab *grab, static void drag_handle_pointer_axis(struct wlr_seat_pointer_grab *grab,
uint32_t time, enum wlr_axis_orientation orientation, double value, uint32_t time, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction) { enum wlr_axis_relative_direction relative_direction) {
// This space is intentionally left blank // This space is intentionally left blank
} }

6
types/seat/wlr_seat_pointer.c
View File

@ -29,7 +29,7 @@ static uint32_t default_pointer_button(struct wlr_seat_pointer_grab *grab,
static void default_pointer_axis(struct wlr_seat_pointer_grab *grab, static void default_pointer_axis(struct wlr_seat_pointer_grab *grab,
uint32_t time, enum wlr_axis_orientation orientation, double value, uint32_t time, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction) { enum wlr_axis_relative_direction relative_direction) {
wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, wlr_seat_pointer_send_axis(grab->seat, time, orientation, value,
value_discrete, source, relative_direction); value_discrete, source, relative_direction);
@ -321,7 +321,7 @@ static void update_value120_accumulators(struct wlr_seat_client *client,
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction) { enum wlr_axis_relative_direction relative_direction) {
struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client; struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) { if (client == NULL) {
@ -484,7 +484,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction) { enum wlr_axis_relative_direction relative_direction) {
clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event); clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event);
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;

2
types/xdg_shell/wlr_xdg_popup.c
View File

@ -82,7 +82,7 @@ static uint32_t xdg_pointer_grab_button(struct wlr_seat_pointer_grab *grab,
static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
uint32_t time, enum wlr_axis_orientation orientation, double value, uint32_t time, enum wlr_axis_orientation orientation, double value,
int32_t value_discrete, enum wlr_axis_source source, int32_t value_discrete, enum wl_pointer_axis_source source,
enum wlr_axis_relative_direction relative_direction) { enum wlr_axis_relative_direction relative_direction) {
wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, wlr_seat_pointer_send_axis(grab->seat, time, orientation, value,
value_discrete, source, relative_direction); value_discrete, source, relative_direction);