Refactor out wlr_pointer_state
This commit is contained in:
parent
0a3246ad97
commit
53e7bebd23
|
@ -10,7 +10,13 @@
|
||||||
struct wlr_pointer *wlr_libinput_pointer_create(
|
struct wlr_pointer *wlr_libinput_pointer_create(
|
||||||
struct libinput_device *libinput_dev) {
|
struct libinput_device *libinput_dev) {
|
||||||
assert(libinput_dev);
|
assert(libinput_dev);
|
||||||
return wlr_pointer_create(NULL, NULL);
|
struct wlr_pointer *wlr_pointer = calloc(1, sizeof(struct wlr_pointer));
|
||||||
|
if (!wlr_pointer) {
|
||||||
|
wlr_log(L_ERROR, "Unable to allocate wlr_pointer");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
wlr_pointer_init(wlr_pointer, NULL);
|
||||||
|
return wlr_pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void handle_pointer_motion(struct libinput_event *event,
|
void handle_pointer_motion(struct libinput_event *event,
|
||||||
|
|
|
@ -17,31 +17,33 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
|
||||||
wl_fixed_t surface_y) {
|
wl_fixed_t surface_y) {
|
||||||
struct wlr_input_device *dev = data;
|
struct wlr_input_device *dev = data;
|
||||||
struct wlr_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev;
|
struct wlr_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev;
|
||||||
assert(dev && dev->pointer && dev->pointer->state);
|
assert(dev && dev->pointer);
|
||||||
|
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
|
||||||
struct wlr_wl_backend_output* output =
|
struct wlr_wl_backend_output* output =
|
||||||
wlr_wl_output_for_surface(wlr_wl_dev->backend, surface);
|
wlr_wl_output_for_surface(wlr_wl_dev->backend, surface);
|
||||||
assert(output);
|
assert(output);
|
||||||
dev->pointer->state->current_output = output;
|
wlr_wl_pointer->current_output = 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_input_device *dev = data;
|
struct wlr_input_device *dev = data;
|
||||||
assert(dev && dev->pointer && dev->pointer->state);
|
assert(dev && dev->pointer);
|
||||||
dev->pointer->state->current_output = NULL;
|
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
|
||||||
|
wlr_wl_pointer->current_output = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 surface_x, wl_fixed_t surface_y) {
|
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
|
||||||
struct wlr_input_device *dev = data;
|
struct wlr_input_device *dev = data;
|
||||||
assert(dev && dev->pointer && dev->pointer->state);
|
assert(dev && dev->pointer);
|
||||||
struct wlr_pointer_state *state = dev->pointer->state;
|
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
|
||||||
if (!state->current_output) {
|
if (!wlr_wl_pointer->current_output) {
|
||||||
wlr_log(L_ERROR, "pointer motion event without current output");
|
wlr_log(L_ERROR, "pointer motion event without current output");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int width, height;
|
int width, height;
|
||||||
wl_egl_window_get_attached_size(state->current_output->egl_window,
|
wl_egl_window_get_attached_size(wlr_wl_pointer->current_output->egl_window,
|
||||||
&width, &height);
|
&width, &height);
|
||||||
struct wlr_event_pointer_motion_absolute wlr_event;
|
struct wlr_event_pointer_motion_absolute wlr_event;
|
||||||
wlr_event.time_sec = time / 1000;
|
wlr_event.time_sec = time / 1000;
|
||||||
|
@ -70,13 +72,14 @@ 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_input_device *dev = data;
|
struct wlr_input_device *dev = data;
|
||||||
assert(dev && dev->pointer);
|
assert(dev && dev->pointer);
|
||||||
|
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
|
||||||
|
|
||||||
struct wlr_event_pointer_axis wlr_event;
|
struct wlr_event_pointer_axis wlr_event;
|
||||||
wlr_event.delta = value;
|
wlr_event.delta = value;
|
||||||
wlr_event.orientation = axis;
|
wlr_event.orientation = axis;
|
||||||
wlr_event.time_sec = time / 1000;
|
wlr_event.time_sec = time / 1000;
|
||||||
wlr_event.time_usec = time * 1000;
|
wlr_event.time_usec = time * 1000;
|
||||||
wlr_event.source = dev->pointer->state->axis_source;
|
wlr_event.source = wlr_wl_pointer->axis_source;
|
||||||
wl_signal_emit(&dev->pointer->events.axis, &wlr_event);
|
wl_signal_emit(&dev->pointer->events.axis, &wlr_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,8 +90,10 @@ 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_input_device *dev = data;
|
struct wlr_input_device *dev = data;
|
||||||
assert(dev && dev->pointer && dev->pointer->state);
|
assert(dev && dev->pointer);
|
||||||
dev->pointer->state->axis_source = axis_source;
|
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
|
||||||
|
|
||||||
|
wlr_wl_pointer->axis_source = axis_source;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer,
|
static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer,
|
||||||
|
@ -173,14 +178,6 @@ static struct wlr_input_device_impl input_device_impl = {
|
||||||
.destroy = input_device_destroy
|
.destroy = input_device_destroy
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pointer_destroy(struct wlr_pointer_state *state) {
|
|
||||||
free(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct wlr_pointer_impl pointer_impl = {
|
|
||||||
.destroy = pointer_destroy
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend,
|
static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend,
|
||||||
enum wlr_input_device_type type) {
|
enum wlr_input_device_type type) {
|
||||||
struct wlr_wl_input_device *wlr_wl_dev;
|
struct wlr_wl_input_device *wlr_wl_dev;
|
||||||
|
@ -208,15 +205,15 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
|
||||||
|
|
||||||
if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
|
if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
|
||||||
wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat);
|
wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat);
|
||||||
struct wlr_pointer_state *pointer_state;
|
struct wlr_wl_pointer *wlr_wl_pointer;
|
||||||
if (!(pointer_state = calloc(1, sizeof(struct wlr_pointer_state)))) {
|
if (!(wlr_wl_pointer = calloc(1, sizeof(struct wlr_wl_pointer)))) {
|
||||||
wlr_log(L_ERROR, "Unable to allocate wlr_pointer_state");
|
wlr_log(L_ERROR, "Unable to allocate wlr_wl_pointer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_input_device *wlr_device;
|
struct wlr_input_device *wlr_device;
|
||||||
if (!(wlr_device = allocate_device(backend, WLR_INPUT_DEVICE_POINTER))) {
|
if (!(wlr_device = allocate_device(backend, WLR_INPUT_DEVICE_POINTER))) {
|
||||||
free(pointer_state);
|
free(wlr_wl_pointer);
|
||||||
wlr_log(L_ERROR, "Unable to allocate wlr_device for pointer");
|
wlr_log(L_ERROR, "Unable to allocate wlr_device for pointer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -225,7 +222,8 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
|
||||||
|
|
||||||
struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat);
|
struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat);
|
||||||
wl_pointer_add_listener(wl_pointer, &pointer_listener, wlr_device);
|
wl_pointer_add_listener(wl_pointer, &pointer_listener, wlr_device);
|
||||||
wlr_device->pointer = wlr_pointer_create(&pointer_impl, pointer_state);
|
wlr_device->pointer = &wlr_wl_pointer->wlr_pointer;
|
||||||
|
wlr_pointer_init(wlr_device->pointer, NULL);
|
||||||
wlr_wl_device->resource = wl_pointer;
|
wlr_wl_device->resource = wl_pointer;
|
||||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,8 @@ struct wlr_wl_input_device {
|
||||||
void *resource;
|
void *resource;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_pointer_state {
|
struct wlr_wl_pointer {
|
||||||
|
struct wlr_pointer wlr_pointer;
|
||||||
enum wlr_axis_source axis_source;
|
enum wlr_axis_source axis_source;
|
||||||
struct wlr_wl_backend_output *current_output;
|
struct wlr_wl_backend_output *current_output;
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
#include <wlr/types/wlr_pointer.h>
|
#include <wlr/types/wlr_pointer.h>
|
||||||
|
|
||||||
struct wlr_pointer_impl {
|
struct wlr_pointer_impl {
|
||||||
void (*destroy)(struct wlr_pointer_state *state);
|
void (*destroy)(struct wlr_pointer *pointer);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_pointer *wlr_pointer_create(struct wlr_pointer_impl *impl,
|
void wlr_pointer_init(struct wlr_pointer *pointer,
|
||||||
struct wlr_pointer_state *state);
|
struct wlr_pointer_impl *impl);
|
||||||
void wlr_pointer_destroy(struct wlr_pointer *pointer);
|
void wlr_pointer_destroy(struct wlr_pointer *pointer);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4,11 +4,9 @@
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
struct wlr_pointer_state;
|
|
||||||
struct wlr_pointer_impl;
|
struct wlr_pointer_impl;
|
||||||
|
|
||||||
struct wlr_pointer {
|
struct wlr_pointer {
|
||||||
struct wlr_pointer_state *state;
|
|
||||||
struct wlr_pointer_impl *impl;
|
struct wlr_pointer_impl *impl;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
|
|
@ -4,22 +4,20 @@
|
||||||
#include <wlr/types/wlr_pointer.h>
|
#include <wlr/types/wlr_pointer.h>
|
||||||
#include <wlr/interfaces/wlr_pointer.h>
|
#include <wlr/interfaces/wlr_pointer.h>
|
||||||
|
|
||||||
struct wlr_pointer *wlr_pointer_create(struct wlr_pointer_impl *impl,
|
void wlr_pointer_init(struct wlr_pointer *pointer,
|
||||||
struct wlr_pointer_state *state) {
|
struct wlr_pointer_impl *impl) {
|
||||||
struct wlr_pointer *pointer = calloc(1, sizeof(struct wlr_pointer));
|
|
||||||
pointer->impl = impl;
|
pointer->impl = impl;
|
||||||
pointer->state = state;
|
|
||||||
wl_signal_init(&pointer->events.motion);
|
wl_signal_init(&pointer->events.motion);
|
||||||
wl_signal_init(&pointer->events.motion_absolute);
|
wl_signal_init(&pointer->events.motion_absolute);
|
||||||
wl_signal_init(&pointer->events.button);
|
wl_signal_init(&pointer->events.button);
|
||||||
wl_signal_init(&pointer->events.axis);
|
wl_signal_init(&pointer->events.axis);
|
||||||
return pointer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_pointer_destroy(struct wlr_pointer *pointer) {
|
void wlr_pointer_destroy(struct wlr_pointer *pointer) {
|
||||||
if (!pointer) return;
|
if (!pointer) return;
|
||||||
if (pointer->impl) {
|
if (pointer->impl && pointer->impl->destroy) {
|
||||||
pointer->impl->destroy(pointer->state);
|
pointer->impl->destroy(pointer);
|
||||||
|
} else {
|
||||||
|
free(pointer);
|
||||||
}
|
}
|
||||||
free(pointer);
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue