blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #79 from martinetd/libinput_renaming 

Libinput renaming
This commit is contained in:
Drew DeVault 2017-08-13 08:29:42 -04:00 committed by GitHub
parent 79cd34b0c6 5c82d2f5c3
commit 43fb40e949
8 changed files with 211 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
backend/libinput/backend.c
View File

@ -25,20 +25,20 @@ static const struct libinput_interface libinput_impl = {
static int wlr_libinput_readable(int fd, uint32_t mask, void *_backend) { static int wlr_libinput_readable(int fd, uint32_t mask, void *_backend) {
struct wlr_libinput_backend *backend = _backend; struct wlr_libinput_backend *backend = _backend;
if (libinput_dispatch(backend->libinput) != 0) { if (libinput_dispatch(backend->libinput_context) != 0) {
wlr_log(L_ERROR, "Failed to dispatch libinput"); wlr_log(L_ERROR, "Failed to dispatch libinput");
// TODO: some kind of abort? // TODO: some kind of abort?
return 0; return 0;
} }
struct libinput_event *event; struct libinput_event *event;
while ((event = libinput_get_event(backend->libinput))) { while ((event = libinput_get_event(backend->libinput_context))) {
wlr_libinput_event(backend, event); wlr_libinput_event(backend, event);
libinput_event_destroy(event); libinput_event_destroy(event);
} }
return 0; return 0;
} }
static void wlr_libinput_log(struct libinput *libinput, static void wlr_libinput_log(struct libinput *libinput_context,
enum libinput_log_priority priority, const char *fmt, va_list args) { enum libinput_log_priority priority, const char *fmt, va_list args) {
_wlr_vlog(L_ERROR, fmt, args); _wlr_vlog(L_ERROR, fmt, args);
} }
@ -46,22 +46,22 @@ static void wlr_libinput_log(struct libinput *libinput,
static bool wlr_libinput_backend_init(struct wlr_backend *_backend) { static bool wlr_libinput_backend_init(struct wlr_backend *_backend) {
struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend;
wlr_log(L_DEBUG, "Initializing libinput"); wlr_log(L_DEBUG, "Initializing libinput");
backend->libinput = libinput_udev_create_context(&libinput_impl, backend, backend->libinput_context = libinput_udev_create_context(&libinput_impl, backend,
backend->udev->udev); backend->udev->udev);
if (!backend->libinput) { if (!backend->libinput_context) {
wlr_log(L_ERROR, "Failed to create libinput context"); wlr_log(L_ERROR, "Failed to create libinput context");
return false; return false;
} }
// TODO: Let user customize seat used // TODO: Let user customize seat used
if (libinput_udev_assign_seat(backend->libinput, "seat0") != 0) { if (libinput_udev_assign_seat(backend->libinput_context, "seat0") != 0) {
wlr_log(L_ERROR, "Failed to assign libinput seat"); wlr_log(L_ERROR, "Failed to assign libinput seat");
return false; return false;
} }
// TODO: More sophisticated logging // TODO: More sophisticated logging
libinput_log_set_handler(backend->libinput, wlr_libinput_log); libinput_log_set_handler(backend->libinput_context, wlr_libinput_log);
libinput_log_set_priority(backend->libinput, LIBINPUT_LOG_PRIORITY_ERROR); libinput_log_set_priority(backend->libinput_context, LIBINPUT_LOG_PRIORITY_ERROR);
struct wl_event_loop *event_loop = struct wl_event_loop *event_loop =
wl_display_get_event_loop(backend->display); wl_display_get_event_loop(backend->display);
@ -69,7 +69,7 @@ static bool wlr_libinput_backend_init(struct wlr_backend *_backend) {
wl_event_source_remove(backend->input_event); wl_event_source_remove(backend->input_event);
} }
backend->input_event = wl_event_loop_add_fd(event_loop, backend->input_event = wl_event_loop_add_fd(event_loop,
libinput_get_fd(backend->libinput), WL_EVENT_READABLE, libinput_get_fd(backend->libinput_context), WL_EVENT_READABLE,
wlr_libinput_readable, backend); wlr_libinput_readable, backend);
if (!backend->input_event) { if (!backend->input_event) {
wlr_log(L_ERROR, "Failed to create input event on event loop"); wlr_log(L_ERROR, "Failed to create input event on event loop");
@ -84,17 +84,17 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
return; return;
} }
struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend;
for (size_t i = 0; i < backend->devices->length; i++) { for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
list_t *wlr_devices = backend->devices->items[i]; list_t *wlr_devices = backend->wlr_device_lists->items[i];
for (size_t j = 0; j < wlr_devices->length; j++) { for (size_t j = 0; j < wlr_devices->length; j++) {
struct wlr_input_device *wlr_device = wlr_devices->items[j]; struct wlr_input_device *wlr_dev = wlr_devices->items[j];
wl_signal_emit(&backend->backend.events.input_remove, wlr_device); wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
wlr_input_device_destroy(wlr_device); wlr_input_device_destroy(wlr_dev);
} }
list_free(wlr_devices); list_free(wlr_devices);
} }
list_free(backend->devices); list_free(backend->wlr_device_lists);
libinput_unref(backend->libinput); libinput_unref(backend->libinput_context);
free(backend); free(backend);
} }
@ -107,14 +107,14 @@ static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_libinput_backend *backend = wl_container_of(listener, backend, session_signal); struct wlr_libinput_backend *backend = wl_container_of(listener, backend, session_signal);
struct wlr_session *session = data; struct wlr_session *session = data;
if (!backend->libinput) { if (!backend->libinput_context) {
return; return;
} }
if (session->active) { if (session->active) {
libinput_resume(backend->libinput); libinput_resume(backend->libinput_context);
} else { } else {
libinput_suspend(backend->libinput); libinput_suspend(backend->libinput_context);
} }
} }
@ -129,7 +129,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
} }
wlr_backend_create(&backend->backend, &backend_impl); wlr_backend_create(&backend->backend, &backend_impl);
if (!(backend->devices = list_create())) { if (!(backend->wlr_device_lists = list_create())) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error_backend; goto error_backend;
} }

172
backend/libinput/events.c
View File

@ -9,13 +9,13 @@
struct wlr_input_device *get_appropriate_device( struct wlr_input_device *get_appropriate_device(
enum wlr_input_device_type desired_type, enum wlr_input_device_type desired_type,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
list_t *devices = libinput_device_get_user_data(device); list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
if (!devices) { if (!wlr_devices) {
return NULL; return NULL;
} }
for (size_t i = 0; i < devices->length; ++i) { for (size_t i = 0; i < wlr_devices->length; ++i) {
struct wlr_input_device *dev = devices->items[i]; struct wlr_input_device *dev = wlr_devices->items[i];
if (dev->type == desired_type) { if (dev->type == desired_type) {
return dev; return dev;
} }
@ -33,168 +33,168 @@ static struct wlr_input_device_impl input_device_impl = {
}; };
static struct wlr_input_device *allocate_device( static struct wlr_input_device *allocate_device(
struct wlr_libinput_backend *backend, struct libinput_device *device, struct wlr_libinput_backend *backend, struct libinput_device *libinput_dev,
list_t *devices, enum wlr_input_device_type type) { list_t *wlr_devices, enum wlr_input_device_type type) {
int vendor = libinput_device_get_id_vendor(device); int vendor = libinput_device_get_id_vendor(libinput_dev);
int product = libinput_device_get_id_product(device); int product = libinput_device_get_id_product(libinput_dev);
const char *name = libinput_device_get_name(device); const char *name = libinput_device_get_name(libinput_dev);
struct wlr_input_device_state *devstate = struct wlr_input_device_state *devstate =
calloc(1, sizeof(struct wlr_input_device_state)); calloc(1, sizeof(struct wlr_input_device_state));
devstate->handle = device; devstate->handle = libinput_dev;
libinput_device_ref(device); libinput_device_ref(libinput_dev);
struct wlr_input_device *wlr_device = wlr_input_device_create( struct wlr_input_device *wlr_dev = wlr_input_device_create(
type, &input_device_impl, devstate, type, &input_device_impl, devstate,
name, vendor, product); name, vendor, product);
list_add(devices, wlr_device); list_add(wlr_devices, wlr_dev);
return wlr_device; return wlr_dev;
} }
static void handle_device_added(struct wlr_libinput_backend *backend, static void handle_device_added(struct wlr_libinput_backend *backend,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(backend && device); assert(backend && libinput_dev);
/* /*
* Note: the wlr API exposes only devices with a single capability, because * Note: the wlr API exposes only devices with a single capability, because
* that meshes better with how Wayland does things and is a bit simpler. * that meshes better with how Wayland does things and is a bit simpler.
* However, libinput devices often have multiple capabilities - in such * However, libinput devices often have multiple capabilities - in such
* cases we have to create several devices. * cases we have to create several devices.
*/ */
int vendor = libinput_device_get_id_vendor(device); int vendor = libinput_device_get_id_vendor(libinput_dev);
int product = libinput_device_get_id_product(device); int product = libinput_device_get_id_product(libinput_dev);
const char *name = libinput_device_get_name(device); const char *name = libinput_device_get_name(libinput_dev);
list_t *devices = list_create(); list_t *wlr_devices = list_create();
wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product); wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product);
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_KEYBOARD)) {
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_input_device *wlr_dev = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_KEYBOARD); libinput_dev, wlr_devices, WLR_INPUT_DEVICE_KEYBOARD);
wlr_device->keyboard = wlr_libinput_keyboard_create(device); wlr_dev->keyboard = wlr_libinput_keyboard_create(libinput_dev);
wl_signal_emit(&backend->backend.events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_POINTER)) {
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_input_device *wlr_dev = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_POINTER); libinput_dev, wlr_devices, WLR_INPUT_DEVICE_POINTER);
wlr_device->pointer = wlr_libinput_pointer_create(device); wlr_dev->pointer = wlr_libinput_pointer_create(libinput_dev);
wl_signal_emit(&backend->backend.events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TOUCH)) {
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_input_device *wlr_dev = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TOUCH); libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TOUCH);
wlr_device->touch = wlr_libinput_touch_create(device); wlr_dev->touch = wlr_libinput_touch_create(libinput_dev);
wl_signal_emit(&backend->backend.events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) {
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_input_device *wlr_dev = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TABLET_TOOL); libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TABLET_TOOL);
wlr_device->tablet_tool = wlr_libinput_tablet_tool_create(device); wlr_dev->tablet_tool = wlr_libinput_tablet_tool_create(libinput_dev);
wl_signal_emit(&backend->backend.events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TABLET_PAD)) {
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_input_device *wlr_dev = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TABLET_PAD); libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TABLET_PAD);
wlr_device->tablet_pad = wlr_libinput_tablet_pad_create(device); wlr_dev->tablet_pad = wlr_libinput_tablet_pad_create(libinput_dev);
wl_signal_emit(&backend->backend.events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_GESTURE)) {
// TODO // TODO
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_SWITCH)) { if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_SWITCH)) {
// TODO // TODO
} }
if (devices->length > 0) { if (wlr_devices->length > 0) {
libinput_device_set_user_data(device, devices); libinput_device_set_user_data(libinput_dev, wlr_devices);
list_add(backend->devices, devices); list_add(backend->wlr_device_lists, wlr_devices);
} else { } else {
list_free(devices); list_free(wlr_devices);
} }
} }
static void handle_device_removed(struct wlr_libinput_backend *backend, static void handle_device_removed(struct wlr_libinput_backend *backend,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
list_t *devices = libinput_device_get_user_data(device); list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
if (!devices) { 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);
wlr_log(L_DEBUG, "Removing %s [%d:%d]", name, vendor, product);
if (!wlr_devices) {
return; return;
} }
for (size_t i = 0; i < devices->length; i++) { for (size_t i = 0; i < wlr_devices->length; i++) {
struct wlr_input_device *wlr_device = devices->items[i]; struct wlr_input_device *wlr_dev = wlr_devices->items[i];
wlr_log(L_DEBUG, "Removing %s [%d:%d]", wlr_device->name, wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
wlr_device->vendor, wlr_device->product); wlr_input_device_destroy(wlr_dev);
wl_signal_emit(&backend->backend.events.input_remove, wlr_device);
wlr_input_device_destroy(wlr_device);
} }
for (size_t i = 0; i < backend->devices->length; i++) { for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
if (backend->devices->items[i] == devices) { if (backend->wlr_device_lists->items[i] == wlr_devices) {
list_del(backend->devices, i); list_del(backend->wlr_device_lists, i);
break; break;
} }
} }
list_free(devices); list_free(wlr_devices);
} }
void wlr_libinput_event(struct wlr_libinput_backend *backend, void wlr_libinput_event(struct wlr_libinput_backend *backend,
struct libinput_event *event) { struct libinput_event *event) {
assert(backend && event); assert(backend && event);
struct libinput *context = libinput_event_get_context(event); struct libinput_device *libinput_dev = libinput_event_get_device(event);
struct libinput_device *device = libinput_event_get_device(event);
enum libinput_event_type event_type = libinput_event_get_type(event); enum libinput_event_type event_type = libinput_event_get_type(event);
(void)context;
switch (event_type) { switch (event_type) {
case LIBINPUT_EVENT_DEVICE_ADDED: case LIBINPUT_EVENT_DEVICE_ADDED:
handle_device_added(backend, device); handle_device_added(backend, libinput_dev);
break; break;
case LIBINPUT_EVENT_DEVICE_REMOVED: case LIBINPUT_EVENT_DEVICE_REMOVED:
handle_device_removed(backend, device); handle_device_removed(backend, libinput_dev);
break; break;
case LIBINPUT_EVENT_KEYBOARD_KEY: case LIBINPUT_EVENT_KEYBOARD_KEY:
handle_keyboard_key(event, device); handle_keyboard_key(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_POINTER_MOTION: case LIBINPUT_EVENT_POINTER_MOTION:
handle_pointer_motion(event, device); handle_pointer_motion(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
handle_pointer_motion_abs(event, device); handle_pointer_motion_abs(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_POINTER_BUTTON: case LIBINPUT_EVENT_POINTER_BUTTON:
handle_pointer_button(event, device); handle_pointer_button(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_POINTER_AXIS: case LIBINPUT_EVENT_POINTER_AXIS:
handle_pointer_axis(event, device); handle_pointer_axis(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TOUCH_DOWN: case LIBINPUT_EVENT_TOUCH_DOWN:
handle_touch_down(event, device); handle_touch_down(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TOUCH_UP: case LIBINPUT_EVENT_TOUCH_UP:
handle_touch_up(event, device); handle_touch_up(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TOUCH_MOTION: case LIBINPUT_EVENT_TOUCH_MOTION:
handle_touch_motion(event, device); handle_touch_motion(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TOUCH_CANCEL: case LIBINPUT_EVENT_TOUCH_CANCEL:
handle_touch_cancel(event, device); handle_touch_cancel(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TOUCH_FRAME: case LIBINPUT_EVENT_TOUCH_FRAME:
// no-op (at least for now) // no-op (at least for now)
break; break;
case LIBINPUT_EVENT_TABLET_TOOL_AXIS: case LIBINPUT_EVENT_TABLET_TOOL_AXIS:
handle_tablet_tool_axis(event, device); handle_tablet_tool_axis(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY: case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY:
handle_tablet_tool_proximity(event, device); handle_tablet_tool_proximity(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_TOOL_TIP: case LIBINPUT_EVENT_TABLET_TOOL_TIP:
handle_tablet_tool_tip(event, device); handle_tablet_tool_tip(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: case LIBINPUT_EVENT_TABLET_TOOL_BUTTON:
handle_tablet_tool_button(event, device); handle_tablet_tool_button(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_PAD_BUTTON: case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
handle_tablet_pad_button(event, device); handle_tablet_pad_button(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_PAD_RING: case LIBINPUT_EVENT_TABLET_PAD_RING:
handle_tablet_pad_ring(event, device); handle_tablet_pad_ring(event, libinput_dev);
break; break;
case LIBINPUT_EVENT_TABLET_PAD_STRIP: case LIBINPUT_EVENT_TABLET_PAD_STRIP:
handle_tablet_pad_strip(event, device); handle_tablet_pad_strip(event, libinput_dev);
break; break;
default: default:
wlr_log(L_DEBUG, "Unknown libinput event %d", event_type); wlr_log(L_DEBUG, "Unknown libinput event %d", event_type);

26
backend/libinput/keyboard.c
View File

@ -8,15 +8,15 @@
#include "backend/libinput.h" #include "backend/libinput.h"
struct wlr_keyboard_state { struct wlr_keyboard_state {
struct libinput_device *device; struct libinput_device *libinput_dev;
}; };
static void wlr_libinput_keyboard_set_leds(struct wlr_keyboard_state *kbstate, uint32_t leds) { static void wlr_libinput_keyboard_set_leds(struct wlr_keyboard_state *kbstate, uint32_t leds) {
libinput_device_led_update(kbstate->device, leds); libinput_device_led_update(kbstate->libinput_dev, leds);
} }
static void wlr_libinput_keyboard_destroy(struct wlr_keyboard_state *kbstate) { static void wlr_libinput_keyboard_destroy(struct wlr_keyboard_state *kbstate) {
libinput_device_unref(kbstate->device); libinput_device_unref(kbstate->libinput_dev);
free(kbstate); free(kbstate);
} }
@ -26,20 +26,20 @@ struct wlr_keyboard_impl impl = {
}; };
struct wlr_keyboard *wlr_libinput_keyboard_create( struct wlr_keyboard *wlr_libinput_keyboard_create(
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(device); assert(libinput_dev);
struct wlr_keyboard_state *kbstate = calloc(1, sizeof(struct wlr_keyboard_state)); struct wlr_keyboard_state *kbstate = calloc(1, sizeof(struct wlr_keyboard_state));
kbstate->device = device; kbstate->libinput_dev = libinput_dev;
libinput_device_ref(device); libinput_device_ref(libinput_dev);
libinput_device_led_update(device, 0); libinput_device_led_update(libinput_dev, 0);
return wlr_keyboard_create(&impl, kbstate); return wlr_keyboard_create(&impl, kbstate);
} }
void handle_keyboard_key(struct libinput_event *event, void handle_keyboard_key(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_KEYBOARD, device); get_appropriate_device(WLR_INPUT_DEVICE_KEYBOARD, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a keyboard event for a device with no keyboards?"); wlr_log(L_DEBUG, "Got a keyboard event for a device with no keyboards?");
return; return;
} }
@ -59,5 +59,5 @@ void handle_keyboard_key(struct libinput_event *event,
wlr_event.state = WLR_KEY_PRESSED; wlr_event.state = WLR_KEY_PRESSED;
break; break;
} }
wl_signal_emit(&dev->keyboard->events.key, &wlr_event); wl_signal_emit(&wlr_dev->keyboard->events.key, &wlr_event);
} }

46
backend/libinput/pointer.c
View File

@ -8,16 +8,16 @@
#include "backend/libinput.h" #include "backend/libinput.h"
struct wlr_pointer *wlr_libinput_pointer_create( struct wlr_pointer *wlr_libinput_pointer_create(
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(device); assert(libinput_dev);
return wlr_pointer_create(NULL, NULL); return wlr_pointer_create(NULL, NULL);
} }
void handle_pointer_motion(struct libinput_event *event, void handle_pointer_motion(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?");
return; return;
} }
@ -28,14 +28,14 @@ void handle_pointer_motion(struct libinput_event *event,
wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent); wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent);
wlr_event.delta_x = libinput_event_pointer_get_dx(pevent); wlr_event.delta_x = libinput_event_pointer_get_dx(pevent);
wlr_event.delta_y = libinput_event_pointer_get_dy(pevent); wlr_event.delta_y = libinput_event_pointer_get_dy(pevent);
wl_signal_emit(&dev->pointer->events.motion, &wlr_event); wl_signal_emit(&wlr_dev->pointer->events.motion, &wlr_event);
} }
void handle_pointer_motion_abs(struct libinput_event *event, void handle_pointer_motion_abs(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?");
return; return;
} }
@ -46,15 +46,15 @@ void handle_pointer_motion_abs(struct libinput_event *event,
wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent); wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent);
wlr_event.x_mm = libinput_event_pointer_get_absolute_x(pevent); wlr_event.x_mm = libinput_event_pointer_get_absolute_x(pevent);
wlr_event.y_mm = libinput_event_pointer_get_absolute_y(pevent); wlr_event.y_mm = libinput_event_pointer_get_absolute_y(pevent);
libinput_device_get_size(device, &wlr_event.width_mm, &wlr_event.height_mm); libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
wl_signal_emit(&dev->pointer->events.motion_absolute, &wlr_event); wl_signal_emit(&wlr_dev->pointer->events.motion_absolute, &wlr_event);
} }
void handle_pointer_button(struct libinput_event *event, void handle_pointer_button(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?");
return; return;
} }
@ -72,14 +72,14 @@ void handle_pointer_button(struct libinput_event *event,
wlr_event.state = WLR_BUTTON_RELEASED; wlr_event.state = WLR_BUTTON_RELEASED;
break; break;
} }
wl_signal_emit(&dev->pointer->events.button, &wlr_event); wl_signal_emit(&wlr_dev->pointer->events.button, &wlr_event);
} }
void handle_pointer_axis(struct libinput_event *event, void handle_pointer_axis(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?");
return; return;
} }
@ -119,6 +119,6 @@ void handle_pointer_axis(struct libinput_event *event,
wlr_event.delta = libinput_event_pointer_get_axis_value( wlr_event.delta = libinput_event_pointer_get_axis_value(
pevent, axies[i]); pevent, axies[i]);
} }
wl_signal_emit(&dev->pointer->events.axis, &wlr_event); wl_signal_emit(&wlr_dev->pointer->events.axis, &wlr_event);
} }
} }

34
backend/libinput/tablet_pad.c
View File

@ -8,16 +8,16 @@
#include "backend/libinput.h" #include "backend/libinput.h"
struct wlr_tablet_pad *wlr_libinput_tablet_pad_create( struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(device); assert(libinput_dev);
return wlr_tablet_pad_create(NULL, NULL); return wlr_tablet_pad_create(NULL, NULL);
} }
void handle_tablet_pad_button(struct libinput_event *event, void handle_tablet_pad_button(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?"); wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?");
return; return;
} }
@ -35,14 +35,14 @@ void handle_tablet_pad_button(struct libinput_event *event,
wlr_event.state = WLR_BUTTON_RELEASED; wlr_event.state = WLR_BUTTON_RELEASED;
break; break;
} }
wl_signal_emit(&dev->tablet_pad->events.button, &wlr_event); wl_signal_emit(&wlr_dev->tablet_pad->events.button, &wlr_event);
} }
void handle_tablet_pad_ring(struct libinput_event *event, void handle_tablet_pad_ring(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?"); wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?");
return; return;
} }
@ -61,14 +61,14 @@ void handle_tablet_pad_ring(struct libinput_event *event,
wlr_event.source = WLR_TABLET_PAD_RING_SOURCE_FINGER; wlr_event.source = WLR_TABLET_PAD_RING_SOURCE_FINGER;
break; break;
} }
wl_signal_emit(&dev->tablet_pad->events.ring, &wlr_event); wl_signal_emit(&wlr_dev->tablet_pad->events.ring, &wlr_event);
} }
void handle_tablet_pad_strip(struct libinput_event *event, void handle_tablet_pad_strip(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_PAD, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?"); wlr_log(L_DEBUG, "Got a tablet pad event for a device with no tablet pad?");
return; return;
} }
@ -87,5 +87,5 @@ void handle_tablet_pad_strip(struct libinput_event *event,
wlr_event.source = WLR_TABLET_PAD_STRIP_SOURCE_FINGER; wlr_event.source = WLR_TABLET_PAD_STRIP_SOURCE_FINGER;
break; break;
} }
wl_signal_emit(&dev->tablet_pad->events.strip, &wlr_event); wl_signal_emit(&wlr_dev->tablet_pad->events.strip, &wlr_event);
} }

52
backend/libinput/tablet_tool.c
View File

@ -8,16 +8,16 @@
#include "backend/libinput.h" #include "backend/libinput.h"
struct wlr_tablet_tool *wlr_libinput_tablet_tool_create( struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(device); assert(libinput_dev);
return wlr_tablet_tool_create(NULL, NULL); return wlr_tablet_tool_create(NULL, NULL);
} }
void handle_tablet_tool_axis(struct libinput_event *event, void handle_tablet_tool_axis(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?"); wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return; return;
} }
@ -26,7 +26,7 @@ void handle_tablet_tool_axis(struct libinput_event *event,
struct wlr_event_tablet_tool_axis wlr_event = { 0 }; struct wlr_event_tablet_tool_axis wlr_event = { 0 };
wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent); wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent);
wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent); wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent);
libinput_device_get_size(device, &wlr_event.width_mm, &wlr_event.height_mm); libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
if (libinput_event_tablet_tool_x_has_changed(tevent)) { if (libinput_event_tablet_tool_x_has_changed(tevent)) {
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_X; wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_X;
wlr_event.x_mm = libinput_event_tablet_tool_get_x(tevent); wlr_event.x_mm = libinput_event_tablet_tool_get_x(tevent);
@ -63,14 +63,14 @@ void handle_tablet_tool_axis(struct libinput_event *event,
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_WHEEL; wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_WHEEL;
wlr_event.wheel_delta = libinput_event_tablet_tool_get_wheel_delta(tevent); wlr_event.wheel_delta = libinput_event_tablet_tool_get_wheel_delta(tevent);
} }
wl_signal_emit(&dev->tablet_tool->events.axis, &wlr_event); wl_signal_emit(&wlr_dev->tablet_tool->events.axis, &wlr_event);
} }
void handle_tablet_tool_proximity(struct libinput_event *event, void handle_tablet_tool_proximity(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?"); wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return; return;
} }
@ -85,21 +85,21 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
break; break;
case LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN: case LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN:
wlr_event.state = WLR_TABLET_TOOL_PROXIMITY_IN; wlr_event.state = WLR_TABLET_TOOL_PROXIMITY_IN;
handle_tablet_tool_axis(event, device); handle_tablet_tool_axis(event, libinput_dev);
break; break;
} }
wl_signal_emit(&dev->tablet_tool->events.proximity, &wlr_event); wl_signal_emit(&wlr_dev->tablet_tool->events.proximity, &wlr_event);
} }
void handle_tablet_tool_tip(struct libinput_event *event, void handle_tablet_tool_tip(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?"); wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return; return;
} }
handle_tablet_tool_axis(event, device); handle_tablet_tool_axis(event, libinput_dev);
struct libinput_event_tablet_tool *tevent = struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event); libinput_event_get_tablet_tool_event(event);
struct wlr_event_tablet_tool_tip wlr_event = { 0 }; struct wlr_event_tablet_tool_tip wlr_event = { 0 };
@ -113,18 +113,18 @@ void handle_tablet_tool_tip(struct libinput_event *event,
wlr_event.state = WLR_TABLET_TOOL_TIP_DOWN; wlr_event.state = WLR_TABLET_TOOL_TIP_DOWN;
break; break;
} }
wl_signal_emit(&dev->tablet_tool->events.tip, &wlr_event); wl_signal_emit(&wlr_dev->tablet_tool->events.tip, &wlr_event);
} }
void handle_tablet_tool_button(struct libinput_event *event, void handle_tablet_tool_button(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, device); get_appropriate_device(WLR_INPUT_DEVICE_TABLET_TOOL, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?"); wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return; return;
} }
handle_tablet_tool_axis(event, device); handle_tablet_tool_axis(event, libinput_dev);
struct libinput_event_tablet_tool *tevent = struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event); libinput_event_get_tablet_tool_event(event);
struct wlr_event_tablet_tool_button wlr_event = { 0 }; struct wlr_event_tablet_tool_button wlr_event = { 0 };
@ -139,5 +139,5 @@ void handle_tablet_tool_button(struct libinput_event *event,
wlr_event.state = WLR_BUTTON_PRESSED; wlr_event.state = WLR_BUTTON_PRESSED;
break; break;
} }
wl_signal_emit(&dev->tablet_tool->events.button, &wlr_event); wl_signal_emit(&wlr_dev->tablet_tool->events.button, &wlr_event);
} }

48
backend/libinput/touch.c
View File

@ -8,16 +8,16 @@
#include "backend/libinput.h" #include "backend/libinput.h"
struct wlr_touch *wlr_libinput_touch_create( struct wlr_touch *wlr_libinput_touch_create(
struct libinput_device *device) { struct libinput_device *libinput_dev) {
assert(device); assert(libinput_dev);
return wlr_touch_create(NULL, NULL); return wlr_touch_create(NULL, NULL);
} }
void handle_touch_down(struct libinput_event *event, void handle_touch_down(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, device); get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a touch event for a device with no touch?"); wlr_log(L_DEBUG, "Got a touch event for a device with no touch?");
return; return;
} }
@ -29,15 +29,15 @@ void handle_touch_down(struct libinput_event *event,
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
wlr_event.x_mm = libinput_event_touch_get_x(tevent); wlr_event.x_mm = libinput_event_touch_get_x(tevent);
wlr_event.y_mm = libinput_event_touch_get_y(tevent); wlr_event.y_mm = libinput_event_touch_get_y(tevent);
libinput_device_get_size(device, &wlr_event.width_mm, &wlr_event.height_mm); libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
wl_signal_emit(&dev->touch->events.down, &wlr_event); wl_signal_emit(&wlr_dev->touch->events.down, &wlr_event);
} }
void handle_touch_up(struct libinput_event *event, void handle_touch_up(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, device); get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a touch event for a device with no touch?"); wlr_log(L_DEBUG, "Got a touch event for a device with no touch?");
return; return;
} }
@ -47,14 +47,14 @@ void handle_touch_up(struct libinput_event *event,
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
wl_signal_emit(&dev->touch->events.up, &wlr_event); wl_signal_emit(&wlr_dev->touch->events.up, &wlr_event);
} }
void handle_touch_motion(struct libinput_event *event, void handle_touch_motion(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, device); get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a touch event for a device with no touch?"); wlr_log(L_DEBUG, "Got a touch event for a device with no touch?");
return; return;
} }
@ -66,15 +66,15 @@ void handle_touch_motion(struct libinput_event *event,
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
wlr_event.x_mm = libinput_event_touch_get_x(tevent); wlr_event.x_mm = libinput_event_touch_get_x(tevent);
wlr_event.y_mm = libinput_event_touch_get_y(tevent); wlr_event.y_mm = libinput_event_touch_get_y(tevent);
libinput_device_get_size(device, &wlr_event.width_mm, &wlr_event.height_mm); libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
wl_signal_emit(&dev->touch->events.motion, &wlr_event); wl_signal_emit(&wlr_dev->touch->events.motion, &wlr_event);
} }
void handle_touch_cancel(struct libinput_event *event, void handle_touch_cancel(struct libinput_event *event,
struct libinput_device *device) { struct libinput_device *libinput_dev) {
struct wlr_input_device *dev = struct wlr_input_device *wlr_dev =
get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, device); get_appropriate_device(WLR_INPUT_DEVICE_TOUCH, libinput_dev);
if (!dev) { if (!wlr_dev) {
wlr_log(L_DEBUG, "Got a touch event for a device with no touch?"); wlr_log(L_DEBUG, "Got a touch event for a device with no touch?");
return; return;
} }
@ -84,5 +84,5 @@ void handle_touch_cancel(struct libinput_event *event,
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
wl_signal_emit(&dev->touch->events.cancel, &wlr_event); wl_signal_emit(&wlr_dev->touch->events.cancel, &wlr_event);
} }

4
include/backend/libinput.h
View File

@ -14,12 +14,12 @@ struct wlr_libinput_backend {
struct wlr_udev *udev; struct wlr_udev *udev;
struct wl_display *display; struct wl_display *display;
struct libinput *libinput; struct libinput *libinput_context;
struct wl_event_source *input_event; struct wl_event_source *input_event;
struct wl_listener session_signal; struct wl_listener session_signal;
list_t *devices; list_t *wlr_device_lists;
}; };
struct wlr_input_device_state { struct wlr_input_device_state {