aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/backend.c4
-rw-r--r--backend/libinput/backend.c5
-rw-r--r--backend/libinput/events.c19
-rw-r--r--backend/libinput/keyboard.c25
-rw-r--r--backend/libinput/pointer.c8
-rw-r--r--backend/libinput/tablet_pad.c8
-rw-r--r--backend/libinput/tablet_tool.c8
-rw-r--r--backend/libinput/touch.c8
-rw-r--r--backend/wayland/output.c2
-rw-r--r--backend/wayland/wl_seat.c94
10 files changed, 111 insertions, 70 deletions
diff --git a/backend/backend.c b/backend/backend.c
index fc8ccdb0..790a14b3 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -32,8 +32,10 @@ bool wlr_backend_start(struct wlr_backend *backend) {
}
void wlr_backend_destroy(struct wlr_backend *backend) {
- if (backend->impl->destroy) {
+ if (backend->impl && backend->impl->destroy) {
backend->impl->destroy(backend);
+ } else {
+ free(backend);
}
}
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 18e4826c..a8f43fbc 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -151,6 +151,7 @@ error_backend:
return NULL;
}
-struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *dev) {
- return dev->state->handle;
+struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *_dev) {
+ struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev;
+ return dev->handle;
}
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index a7c781c2..0e434b7c 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -23,9 +23,10 @@ struct wlr_input_device *get_appropriate_device(
return NULL;
}
-static void wlr_libinput_device_destroy(struct wlr_input_device_state *state) {
- libinput_device_unref(state->handle);
- free(state);
+static void wlr_libinput_device_destroy(struct wlr_input_device *_dev) {
+ struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev;
+ libinput_device_unref(dev->handle);
+ free(dev);
}
static struct wlr_input_device_impl input_device_impl = {
@@ -38,13 +39,13 @@ static struct wlr_input_device *allocate_device(
int vendor = libinput_device_get_id_vendor(libinput_dev);
int product = libinput_device_get_id_product(libinput_dev);
const char *name = libinput_device_get_name(libinput_dev);
- struct wlr_input_device_state *devstate =
- calloc(1, sizeof(struct wlr_input_device_state));
- devstate->handle = libinput_dev;
+ struct wlr_libinput_input_device *wlr_libinput_dev =
+ calloc(1, sizeof(struct wlr_libinput_input_device));
+ struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device;
+ wlr_libinput_dev->handle = libinput_dev;
libinput_device_ref(libinput_dev);
- struct wlr_input_device *wlr_dev = wlr_input_device_create(
- type, &input_device_impl, devstate,
- name, vendor, product);
+ wlr_input_device_init(wlr_dev, type, &input_device_impl,
+ name, vendor, product);
list_add(wlr_devices, wlr_dev);
return wlr_dev;
}
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index b231828d..db4ac0ed 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -7,17 +7,21 @@
#include <wlr/util/log.h>
#include "backend/libinput.h"
-struct wlr_keyboard_state {
+struct wlr_libinput_keyboard {
+ struct wlr_keyboard wlr_keyboard;
struct libinput_device *libinput_dev;
};
-static void wlr_libinput_keyboard_set_leds(struct wlr_keyboard_state *kbstate, uint32_t leds) {
- libinput_device_led_update(kbstate->libinput_dev, leds);
+static void wlr_libinput_keyboard_set_leds(struct wlr_keyboard *wlr_kb, uint32_t leds) {
+ struct wlr_libinput_keyboard *wlr_libinput_kb = (struct wlr_libinput_keyboard *)wlr_kb;
+ libinput_device_led_update(wlr_libinput_kb->libinput_dev, leds);
}
-static void wlr_libinput_keyboard_destroy(struct wlr_keyboard_state *kbstate) {
- libinput_device_unref(kbstate->libinput_dev);
- free(kbstate);
+static void wlr_libinput_keyboard_destroy(struct wlr_keyboard *wlr_kb) {
+ struct wlr_libinput_keyboard *wlr_libinput_kb =
+ (struct wlr_libinput_keyboard *)wlr_kb;
+ libinput_device_unref(wlr_libinput_kb->libinput_dev);
+ free(wlr_libinput_kb);
}
struct wlr_keyboard_impl impl = {
@@ -28,11 +32,14 @@ struct wlr_keyboard_impl impl = {
struct wlr_keyboard *wlr_libinput_keyboard_create(
struct libinput_device *libinput_dev) {
assert(libinput_dev);
- struct wlr_keyboard_state *kbstate = calloc(1, sizeof(struct wlr_keyboard_state));
- kbstate->libinput_dev = libinput_dev;
+ struct wlr_libinput_keyboard *wlr_libinput_kb =
+ calloc(1, sizeof(struct wlr_libinput_keyboard));
+ wlr_libinput_kb->libinput_dev = libinput_dev;
libinput_device_ref(libinput_dev);
libinput_device_led_update(libinput_dev, 0);
- return wlr_keyboard_create(&impl, kbstate);
+ struct wlr_keyboard *wlr_kb = &wlr_libinput_kb->wlr_keyboard;
+ wlr_keyboard_init(wlr_kb, &impl);
+ return wlr_kb;
}
void handle_keyboard_key(struct libinput_event *event,
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/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 9713bb1d..efad1068 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -10,7 +10,13 @@
struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
struct libinput_device *libinput_dev) {
assert(libinput_dev);
- return wlr_tablet_pad_create(NULL, NULL);
+ struct wlr_tablet_pad *wlr_tablet_pad = calloc(1, sizeof(struct wlr_tablet_pad));
+ if (!wlr_tablet_pad) {
+ wlr_log(L_ERROR, "Unable to allocate wlr_tablet_pad");
+ return NULL;
+ }
+ wlr_tablet_pad_init(wlr_tablet_pad, NULL);
+ return wlr_tablet_pad;
}
void handle_tablet_pad_button(struct libinput_event *event,
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index efe77f0a..8b3d34ed 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -10,7 +10,13 @@
struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
struct libinput_device *libinput_dev) {
assert(libinput_dev);
- return wlr_tablet_tool_create(NULL, NULL);
+ struct wlr_tablet_tool *wlr_tablet_tool = calloc(1, sizeof(struct wlr_tablet_tool));
+ if (!wlr_tablet_tool) {
+ wlr_log(L_ERROR, "Unable to allocate wlr_tablet_tool");
+ return NULL;
+ }
+ wlr_tablet_tool_init(wlr_tablet_tool, NULL);
+ return wlr_tablet_tool;
}
void handle_tablet_tool_axis(struct libinput_event *event,
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index 5d990d3c..9e08d028 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -10,7 +10,13 @@
struct wlr_touch *wlr_libinput_touch_create(
struct libinput_device *libinput_dev) {
assert(libinput_dev);
- return wlr_touch_create(NULL, NULL);
+ struct wlr_touch *wlr_touch = calloc(1, sizeof(struct wlr_touch));
+ if (!wlr_touch) {
+ wlr_log(L_ERROR, "Unable to allocate wlr_touch");
+ return NULL;
+ }
+ wlr_touch_init(wlr_touch, NULL);
+ return wlr_touch;
}
void handle_touch_down(struct libinput_event *event,
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 6a7b9e54..767d1c6b 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -103,7 +103,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
struct wlr_wl_backend_output *output;
if (!(output = calloc(sizeof(struct wlr_wl_backend_output), 1))) {
- wlr_log(L_ERROR, "Failed to allocate wlr_output_state");
+ wlr_log(L_ERROR, "Failed to allocate wlr_wl_backend_output");
return NULL;
}
wlr_output_init(&output->wlr_output, &output_impl);
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index 99a67df5..43e73dac 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -16,31 +16,34 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface, 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_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev;
+ 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(dev->state->backend, surface);
+ 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;
@@ -69,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);
}
@@ -86,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,
@@ -160,46 +166,35 @@ static struct wl_keyboard_listener keyboard_listener = {
.repeat_info = keyboard_handle_repeat_info
};
-static void input_device_destroy(struct wlr_input_device_state *state) {
- wl_signal_emit(&state->backend->backend.events.input_remove, state->wlr_device);
- if (state->resource)
- wl_proxy_destroy(state->resource);
- free(state);
+static void input_device_destroy(struct wlr_input_device *_dev) {
+ struct wlr_wl_input_device *dev = (struct wlr_wl_input_device *)_dev;
+ wl_signal_emit(&dev->backend->backend.events.input_remove, &dev->wlr_input_device);
+ if (dev->resource) {
+ wl_proxy_destroy(dev->resource);
+ }
+ free(dev);
}
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_input_device_state *devstate;
- if (!(devstate = calloc(1, sizeof(struct wlr_input_device_state)))) {
+ struct wlr_wl_input_device *wlr_wl_dev;
+ if (!(wlr_wl_dev = calloc(1, sizeof(struct wlr_wl_input_device)))) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL;
}
- devstate->backend = backend;
+ wlr_wl_dev->backend = backend;
int vendor = 0;
int product = 0;
const char *name = "wayland";
- struct wlr_input_device *wlr_device = wlr_input_device_create(
- type, &input_device_impl, devstate,
- name, vendor, product);
- if (!wlr_device) {
- free(devstate);
- return NULL;
- }
- devstate->wlr_device = wlr_device;
+ struct wlr_input_device *wlr_device = &wlr_wl_dev->wlr_input_device;
+ wlr_input_device_init(wlr_device, type, &input_device_impl,
+ name, vendor, product);
list_add(backend->devices, wlr_device);
return wlr_device;
}
@@ -211,23 +206,26 @@ 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;
}
+ struct wlr_wl_input_device *wlr_wl_device =
+ (struct wlr_wl_input_device *)wlr_device;
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->state->resource = wl_pointer;
+ 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);
}
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
@@ -238,11 +236,19 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
wlr_log(L_ERROR, "Unable to allocate wl_pointer device");
return;
}
+ wlr_device->keyboard = calloc(1, sizeof(struct wlr_keyboard));
+ if (!wlr_device->keyboard) {
+ free(wlr_device);
+ wlr_log(L_ERROR, "Unable to allocate wlr keyboard");
+ return;
+ }
+ wlr_keyboard_init(wlr_device->keyboard, NULL);
+ struct wlr_wl_input_device *wlr_wl_device =
+ (struct wlr_wl_input_device *)wlr_device;
struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_device);
- wlr_device->keyboard = wlr_keyboard_create(NULL, NULL);
- wlr_device->state->resource = wl_keyboard;
+ wlr_wl_device->resource = wl_keyboard;
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 08:14:39 +0000