aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/libinput/pointer.c8
-rw-r--r--backend/wayland/wl_seat.c46
-rw-r--r--include/backend/wayland.h3
-rw-r--r--include/wlr/interfaces/wlr_pointer.h6
-rw-r--r--include/wlr/types/wlr_pointer.h2
-rw-r--r--types/wlr_pointer.c14
6 files changed, 40 insertions, 39 deletions
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index c2c47592..8bda205d 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -10,7 +10,13 @@
struct wlr_pointer *wlr_libinput_pointer_create(
struct libinput_device *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,
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index 7afe8775..010566bb 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -17,31 +17,33 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
wl_fixed_t surface_y) {
struct wlr_input_device *dev = data;
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 =
wlr_wl_output_for_surface(wlr_wl_dev->backend, surface);
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,
uint32_t serial, struct wl_surface *surface) {
struct wlr_input_device *dev = data;
- assert(dev && dev->pointer && dev->pointer->state);
- dev->pointer->state->current_output = NULL;
+ assert(dev && dev->pointer);
+ 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,
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
struct wlr_input_device *dev = data;
- assert(dev && dev->pointer && dev->pointer->state);
- struct wlr_pointer_state *state = dev->pointer->state;
- if (!state->current_output) {
+ assert(dev && dev->pointer);
+ struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
+ if (!wlr_wl_pointer->current_output) {
wlr_log(L_ERROR, "pointer motion event without current output");
return;
}
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);
struct wlr_event_pointer_motion_absolute wlr_event;
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) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer);
+ struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
struct wlr_event_pointer_axis wlr_event;
wlr_event.delta = value;
wlr_event.orientation = axis;
wlr_event.time_sec = 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);
}
@@ -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,
uint32_t axis_source) {
struct wlr_input_device *dev = data;
- assert(dev && dev->pointer && dev->pointer->state);
- dev->pointer->state->axis_source = axis_source;
+ assert(dev && dev->pointer);
+ 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,
@@ -173,14 +178,6 @@ static struct wlr_input_device_impl input_device_impl = {
.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,
enum wlr_input_device_type type) {
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)) {
wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat);
- struct wlr_pointer_state *pointer_state;
- if (!(pointer_state = calloc(1, sizeof(struct wlr_pointer_state)))) {
- wlr_log(L_ERROR, "Unable to allocate wlr_pointer_state");
+ struct wlr_wl_pointer *wlr_wl_pointer;
+ if (!(wlr_wl_pointer = calloc(1, sizeof(struct wlr_wl_pointer)))) {
+ wlr_log(L_ERROR, "Unable to allocate wlr_wl_pointer");
return;
}
struct wlr_input_device *wlr_device;
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");
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);
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;
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
}
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 6d4b0138..d930f21b 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -48,7 +48,8 @@ struct wlr_wl_input_device {
void *resource;
};
-struct wlr_pointer_state {
+struct wlr_wl_pointer {
+ struct wlr_pointer wlr_pointer;
enum wlr_axis_source axis_source;
struct wlr_wl_backend_output *current_output;
};
diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h
index 8c3f7e0d..8d4bf703 100644
--- a/include/wlr/interfaces/wlr_pointer.h
+++ b/include/wlr/interfaces/wlr_pointer.h
@@ -3,11 +3,11 @@
#include <wlr/types/wlr_pointer.h>
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,
- struct wlr_pointer_state *state);
+void wlr_pointer_init(struct wlr_pointer *pointer,
+ struct wlr_pointer_impl *impl);
void wlr_pointer_destroy(struct wlr_pointer *pointer);
#endif
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 139ba868..13a2d045 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -4,11 +4,9 @@
#include <wayland-server.h>
#include <stdint.h>
-struct wlr_pointer_state;
struct wlr_pointer_impl;
struct wlr_pointer {
- struct wlr_pointer_state *state;
struct wlr_pointer_impl *impl;
struct {
diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c
index fc1ae808..02c2ce61 100644
--- a/types/wlr_pointer.c
+++ b/types/wlr_pointer.c
@@ -4,22 +4,20 @@
#include <wlr/types/wlr_pointer.h>
#include <wlr/interfaces/wlr_pointer.h>
-struct wlr_pointer *wlr_pointer_create(struct wlr_pointer_impl *impl,
- struct wlr_pointer_state *state) {
- struct wlr_pointer *pointer = calloc(1, sizeof(struct wlr_pointer));
+void wlr_pointer_init(struct wlr_pointer *pointer,
+ struct wlr_pointer_impl *impl) {
pointer->impl = impl;
- pointer->state = state;
wl_signal_init(&pointer->events.motion);
wl_signal_init(&pointer->events.motion_absolute);
wl_signal_init(&pointer->events.button);
wl_signal_init(&pointer->events.axis);
- return pointer;
}
void wlr_pointer_destroy(struct wlr_pointer *pointer) {
if (!pointer) return;
- if (pointer->impl) {
- pointer->impl->destroy(pointer->state);
+ if (pointer->impl && pointer->impl->destroy) {
+ pointer->impl->destroy(pointer);
+ } else {
+ free(pointer);
}
- free(pointer);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-29 05:14:45 +0000