backend/wayland: only set one pointer listener
This commit is contained in:
parent
9e7a997433
commit
ddac792b61
|
@ -288,6 +288,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
|
||||||
wlr_log_errno(L_ERROR, "Could not create output surface");
|
wlr_log_errno(L_ERROR, "Could not create output surface");
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
wl_surface_set_user_data(output->surface, output);
|
||||||
output->xdg_surface =
|
output->xdg_surface =
|
||||||
zxdg_shell_v6_get_xdg_surface(backend->shell, output->surface);
|
zxdg_shell_v6_get_xdg_surface(backend->shell, output->surface);
|
||||||
if (!output->xdg_surface) {
|
if (!output->xdg_surface) {
|
||||||
|
|
|
@ -13,32 +13,64 @@
|
||||||
#include "backend/wayland.h"
|
#include "backend/wayland.h"
|
||||||
#include "util/signal.h"
|
#include "util/signal.h"
|
||||||
|
|
||||||
|
static struct wlr_wl_pointer *output_get_pointer(struct wlr_wl_output *output) {
|
||||||
|
struct wlr_input_device *wlr_dev;
|
||||||
|
wl_list_for_each(wlr_dev, &output->backend->devices, link) {
|
||||||
|
if (wlr_dev->type != WLR_INPUT_DEVICE_POINTER) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
struct wlr_wl_pointer *pointer = pointer_get_wl(wlr_dev->pointer);
|
||||||
|
if (pointer->output == output) {
|
||||||
|
return pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t serial, struct wl_surface *surface, wl_fixed_t sx,
|
uint32_t serial, struct wl_surface *surface, wl_fixed_t sx,
|
||||||
wl_fixed_t sy) {
|
wl_fixed_t sy) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->surface != surface) {
|
if (surface == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pointer->output->enter_serial = serial;
|
struct wlr_wl_output *output = wl_surface_get_user_data(surface);
|
||||||
update_wl_output_cursor(pointer->output);
|
struct wlr_wl_pointer *pointer = output_get_pointer(output);
|
||||||
|
if (output == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
output->enter_serial = serial;
|
||||||
|
backend->current_pointer = pointer;
|
||||||
|
update_wl_output_cursor(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t serial, struct wl_surface *surface) {
|
uint32_t serial, struct wl_surface *surface) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->surface != surface) {
|
if (surface == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pointer->output->enter_serial = 0;
|
struct wlr_wl_output *output = wl_surface_get_user_data(surface);
|
||||||
|
output->enter_serial = 0;
|
||||||
|
|
||||||
|
if (backend->current_pointer == NULL ||
|
||||||
|
backend->current_pointer->output != output) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
backend->current_pointer = NULL;
|
||||||
|
wlr_log(L_DEBUG, "leave %p", surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t time, wl_fixed_t sx, wl_fixed_t sy) {
|
uint32_t time, wl_fixed_t sx, wl_fixed_t sy) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->enter_serial == 0) {
|
struct wlr_wl_pointer *pointer = backend->current_pointer;
|
||||||
|
if (pointer == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,8 +90,9 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
|
||||||
|
|
||||||
static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
|
uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->enter_serial == 0) {
|
struct wlr_wl_pointer *pointer = backend->current_pointer;
|
||||||
|
if (pointer == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,8 +107,9 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
|
||||||
|
|
||||||
static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t time, uint32_t axis, wl_fixed_t value) {
|
uint32_t time, uint32_t axis, wl_fixed_t value) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->enter_serial == 0) {
|
struct wlr_wl_pointer *pointer = backend->current_pointer;
|
||||||
|
if (pointer == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,8 +129,9 @@ static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) {
|
||||||
|
|
||||||
static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer,
|
||||||
uint32_t axis_source) {
|
uint32_t axis_source) {
|
||||||
struct wlr_wl_pointer *pointer = data;
|
struct wlr_wl_backend *backend = data;
|
||||||
if (pointer->output->enter_serial == 0) {
|
struct wlr_wl_pointer *pointer = backend->current_pointer;
|
||||||
|
if (pointer == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -269,10 +304,9 @@ void create_wl_pointer(struct wl_pointer *wl_pointer,
|
||||||
wlr_log(L_ERROR, "Allocation failed");
|
wlr_log(L_ERROR, "Allocation failed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
wlr_dev = &dev->wlr_input_device;
|
|
||||||
pointer->input_device = dev;
|
pointer->input_device = dev;
|
||||||
|
|
||||||
wl_pointer_add_listener(wl_pointer, &pointer_listener, pointer);
|
wlr_dev = &dev->wlr_input_device;
|
||||||
wlr_dev->pointer = &pointer->wlr_pointer;
|
wlr_dev->pointer = &pointer->wlr_pointer;
|
||||||
wlr_dev->output_name = strdup(output->wlr_output.name);
|
wlr_dev->output_name = strdup(output->wlr_output.name);
|
||||||
wlr_pointer_init(wlr_dev->pointer, &pointer_impl);
|
wlr_pointer_init(wlr_dev->pointer, &pointer_impl);
|
||||||
|
@ -295,6 +329,8 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
|
||||||
wl_list_for_each(output, &backend->outputs, link) {
|
wl_list_for_each(output, &backend->outputs, link) {
|
||||||
create_wl_pointer(wl_pointer, output);
|
create_wl_pointer(wl_pointer, output);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wl_pointer_add_listener(wl_pointer, &pointer_listener, backend);
|
||||||
}
|
}
|
||||||
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
|
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
|
||||||
wlr_log(L_DEBUG, "seat %p offered keyboard", (void*) wl_seat);
|
wlr_log(L_DEBUG, "seat %p offered keyboard", (void*) wl_seat);
|
||||||
|
|
|
@ -32,6 +32,7 @@ struct wlr_wl_backend {
|
||||||
struct wl_shm *shm;
|
struct wl_shm *shm;
|
||||||
struct wl_seat *seat;
|
struct wl_seat *seat;
|
||||||
struct wl_pointer *pointer;
|
struct wl_pointer *pointer;
|
||||||
|
struct wlr_wl_pointer *current_pointer;
|
||||||
char *seat_name;
|
char *seat_name;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue