mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-01 22:58:38 -04:00
libinput backend: massive renaming
- 'libinput' (backend's) to libinput_context - 'device' (libinput_device) to libinput_dev - 'dev' (wlr_device) to wlr_dev - 'devices' lists tangling of libinput devices to wlr_devices - 'devices' list of wlr_devices in backend state to wlr_device_lists
This commit is contained in:
Dominique Martinet
parent
08a2afdf6f
commit
5c82d2f5c3
8 changed files with 210 additions and 210 deletions
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
struct wlr_input_device *get_appropriate_device(
|
||||
enum wlr_input_device_type desired_type,
|
||||
struct libinput_device *device) {
|
||||
list_t *devices = libinput_device_get_user_data(device);
|
||||
if (!devices) {
|
||||
struct libinput_device *libinput_dev) {
|
||||
list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
|
||||
if (!wlr_devices) {
|
||||
return NULL;
|
||||
}
|
||||
for (size_t i = 0; i < devices->length; ++i) {
|
||||
struct wlr_input_device *dev = devices->items[i];
|
||||
for (size_t i = 0; i < wlr_devices->length; ++i) {
|
||||
struct wlr_input_device *dev = wlr_devices->items[i];
|
||||
if (dev->type == desired_type) {
|
||||
return dev;
|
||||
}
|
||||
|
|
@ -33,168 +33,168 @@ static struct wlr_input_device_impl input_device_impl = {
|
|||
};
|
||||
|
||||
static struct wlr_input_device *allocate_device(
|
||||
struct wlr_libinput_backend *backend, struct libinput_device *device,
|
||||
list_t *devices, enum wlr_input_device_type type) {
|
||||
int vendor = libinput_device_get_id_vendor(device);
|
||||
int product = libinput_device_get_id_product(device);
|
||||
const char *name = libinput_device_get_name(device);
|
||||
struct wlr_libinput_backend *backend, struct libinput_device *libinput_dev,
|
||||
list_t *wlr_devices, enum wlr_input_device_type type) {
|
||||
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 = device;
|
||||
libinput_device_ref(device);
|
||||
struct wlr_input_device *wlr_device = wlr_input_device_create(
|
||||
devstate->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);
|
||||
list_add(devices, wlr_device);
|
||||
return wlr_device;
|
||||
list_add(wlr_devices, wlr_dev);
|
||||
return wlr_dev;
|
||||
}
|
||||
|
||||
static void handle_device_added(struct wlr_libinput_backend *backend,
|
||||
struct libinput_device *device) {
|
||||
assert(backend && device);
|
||||
struct libinput_device *libinput_dev) {
|
||||
assert(backend && libinput_dev);
|
||||
/*
|
||||
* 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.
|
||||
* However, libinput devices often have multiple capabilities - in such
|
||||
* cases we have to create several devices.
|
||||
*/
|
||||
int vendor = libinput_device_get_id_vendor(device);
|
||||
int product = libinput_device_get_id_product(device);
|
||||
const char *name = libinput_device_get_name(device);
|
||||
list_t *devices = list_create();
|
||||
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);
|
||||
list_t *wlr_devices = list_create();
|
||||
wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product);
|
||||
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) {
|
||||
struct wlr_input_device *wlr_device = allocate_device(backend,
|
||||
device, devices, WLR_INPUT_DEVICE_KEYBOARD);
|
||||
wlr_device->keyboard = wlr_libinput_keyboard_create(device);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_KEYBOARD)) {
|
||||
struct wlr_input_device *wlr_dev = allocate_device(backend,
|
||||
libinput_dev, wlr_devices, WLR_INPUT_DEVICE_KEYBOARD);
|
||||
wlr_dev->keyboard = wlr_libinput_keyboard_create(libinput_dev);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
|
||||
}
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) {
|
||||
struct wlr_input_device *wlr_device = allocate_device(backend,
|
||||
device, devices, WLR_INPUT_DEVICE_POINTER);
|
||||
wlr_device->pointer = wlr_libinput_pointer_create(device);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_POINTER)) {
|
||||
struct wlr_input_device *wlr_dev = allocate_device(backend,
|
||||
libinput_dev, wlr_devices, WLR_INPUT_DEVICE_POINTER);
|
||||
wlr_dev->pointer = wlr_libinput_pointer_create(libinput_dev);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
|
||||
}
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) {
|
||||
struct wlr_input_device *wlr_device = allocate_device(backend,
|
||||
device, devices, WLR_INPUT_DEVICE_TOUCH);
|
||||
wlr_device->touch = wlr_libinput_touch_create(device);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TOUCH)) {
|
||||
struct wlr_input_device *wlr_dev = allocate_device(backend,
|
||||
libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TOUCH);
|
||||
wlr_dev->touch = wlr_libinput_touch_create(libinput_dev);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
|
||||
}
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) {
|
||||
struct wlr_input_device *wlr_device = allocate_device(backend,
|
||||
device, devices, WLR_INPUT_DEVICE_TABLET_TOOL);
|
||||
wlr_device->tablet_tool = wlr_libinput_tablet_tool_create(device);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) {
|
||||
struct wlr_input_device *wlr_dev = allocate_device(backend,
|
||||
libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TABLET_TOOL);
|
||||
wlr_dev->tablet_tool = wlr_libinput_tablet_tool_create(libinput_dev);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_dev);
|
||||
}
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) {
|
||||
struct wlr_input_device *wlr_device = allocate_device(backend,
|
||||
device, devices, WLR_INPUT_DEVICE_TABLET_PAD);
|
||||
wlr_device->tablet_pad = wlr_libinput_tablet_pad_create(device);
|
||||
wl_signal_emit(&backend->backend.events.input_add, wlr_device);
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_TABLET_PAD)) {
|
||||
struct wlr_input_device *wlr_dev = allocate_device(backend,
|
||||
libinput_dev, wlr_devices, WLR_INPUT_DEVICE_TABLET_PAD);
|
||||
wlr_dev->tablet_pad = wlr_libinput_tablet_pad_create(libinput_dev);
|
||||
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
|
||||
}
|
||||
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_SWITCH)) {
|
||||
if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_SWITCH)) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
if (devices->length > 0) {
|
||||
libinput_device_set_user_data(device, devices);
|
||||
list_add(backend->devices, devices);
|
||||
if (wlr_devices->length > 0) {
|
||||
libinput_device_set_user_data(libinput_dev, wlr_devices);
|
||||
list_add(backend->wlr_device_lists, wlr_devices);
|
||||
} else {
|
||||
list_free(devices);
|
||||
list_free(wlr_devices);
|
||||
}
|
||||
}
|
||||
|
||||
static void handle_device_removed(struct wlr_libinput_backend *backend,
|
||||
struct libinput_device *device) {
|
||||
list_t *devices = libinput_device_get_user_data(device);
|
||||
int vendor = libinput_device_get_id_vendor(device);
|
||||
int product = libinput_device_get_id_product(device);
|
||||
const char *name = libinput_device_get_name(device);
|
||||
struct libinput_device *libinput_dev) {
|
||||
list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
|
||||
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 (!devices) {
|
||||
if (!wlr_devices) {
|
||||
return;
|
||||
}
|
||||
for (size_t i = 0; i < devices->length; i++) {
|
||||
struct wlr_input_device *wlr_device = devices->items[i];
|
||||
wl_signal_emit(&backend->backend.events.input_remove, wlr_device);
|
||||
wlr_input_device_destroy(wlr_device);
|
||||
for (size_t i = 0; i < wlr_devices->length; i++) {
|
||||
struct wlr_input_device *wlr_dev = wlr_devices->items[i];
|
||||
wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
|
||||
wlr_input_device_destroy(wlr_dev);
|
||||
}
|
||||
for (size_t i = 0; i < backend->devices->length; i++) {
|
||||
if (backend->devices->items[i] == devices) {
|
||||
list_del(backend->devices, i);
|
||||
for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
|
||||
if (backend->wlr_device_lists->items[i] == wlr_devices) {
|
||||
list_del(backend->wlr_device_lists, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
list_free(devices);
|
||||
list_free(wlr_devices);
|
||||
}
|
||||
|
||||
void wlr_libinput_event(struct wlr_libinput_backend *backend,
|
||||
struct libinput_event *event) {
|
||||
assert(backend && event);
|
||||
struct libinput_device *device = libinput_event_get_device(event);
|
||||
struct libinput_device *libinput_dev = libinput_event_get_device(event);
|
||||
enum libinput_event_type event_type = libinput_event_get_type(event);
|
||||
switch (event_type) {
|
||||
case LIBINPUT_EVENT_DEVICE_ADDED:
|
||||
handle_device_added(backend, device);
|
||||
handle_device_added(backend, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_DEVICE_REMOVED:
|
||||
handle_device_removed(backend, device);
|
||||
handle_device_removed(backend, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_KEYBOARD_KEY:
|
||||
handle_keyboard_key(event, device);
|
||||
handle_keyboard_key(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_POINTER_MOTION:
|
||||
handle_pointer_motion(event, device);
|
||||
handle_pointer_motion(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
|
||||
handle_pointer_motion_abs(event, device);
|
||||
handle_pointer_motion_abs(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_POINTER_BUTTON:
|
||||
handle_pointer_button(event, device);
|
||||
handle_pointer_button(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_POINTER_AXIS:
|
||||
handle_pointer_axis(event, device);
|
||||
handle_pointer_axis(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TOUCH_DOWN:
|
||||
handle_touch_down(event, device);
|
||||
handle_touch_down(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TOUCH_UP:
|
||||
handle_touch_up(event, device);
|
||||
handle_touch_up(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TOUCH_MOTION:
|
||||
handle_touch_motion(event, device);
|
||||
handle_touch_motion(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TOUCH_CANCEL:
|
||||
handle_touch_cancel(event, device);
|
||||
handle_touch_cancel(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TOUCH_FRAME:
|
||||
// no-op (at least for now)
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_TOOL_AXIS:
|
||||
handle_tablet_tool_axis(event, device);
|
||||
handle_tablet_tool_axis(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY:
|
||||
handle_tablet_tool_proximity(event, device);
|
||||
handle_tablet_tool_proximity(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_TOOL_TIP:
|
||||
handle_tablet_tool_tip(event, device);
|
||||
handle_tablet_tool_tip(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_TOOL_BUTTON:
|
||||
handle_tablet_tool_button(event, device);
|
||||
handle_tablet_tool_button(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
|
||||
handle_tablet_pad_button(event, device);
|
||||
handle_tablet_pad_button(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_PAD_RING:
|
||||
handle_tablet_pad_ring(event, device);
|
||||
handle_tablet_pad_ring(event, libinput_dev);
|
||||
break;
|
||||
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
|
||||
handle_tablet_pad_strip(event, device);
|
||||
handle_tablet_pad_strip(event, libinput_dev);
|
||||
break;
|
||||
default:
|
||||
wlr_log(L_DEBUG, "Unknown libinput event %d", event_type);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue