diff options
| author | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
| commit | 27937add762bb2594828ac678859bfdde4275f1e (patch) | |
| tree | aa9813fd534d019a5e967ffad31d153d30ae7fa1 /backend/libinput | |
| parent | 3e3209cba22c9a5a562acc5e543946408a36e2f4 (diff) | |
| parent | bf5640db128b930b38ebca2b1d8a79e028ad9f39 (diff) | |
Merge branch 'master' into laggy-move-resize
Diffstat (limited to 'backend/libinput')
| -rw-r--r-- | backend/libinput/events.c | 5 | ||||
| -rw-r--r-- | backend/libinput/tablet_tool.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 5da45c67..3ca41124 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -66,10 +66,11 @@ static void handle_device_added(struct wlr_libinput_backend *backend, int product = libinput_device_get_id_product(libinput_dev); const char *name = libinput_device_get_name(libinput_dev); struct wl_list *wlr_devices = calloc(1, sizeof(struct wl_list)); - wl_list_init(wlr_devices); if (!wlr_devices) { - goto fail; + wlr_log(L_ERROR, "Allocation failed"); + return; } + wl_list_init(wlr_devices); wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product); if (libinput_device_has_capability(libinput_dev, LIBINPUT_DEVICE_CAP_KEYBOARD)) { diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 3caaf3f7..3d5fafc3 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -70,6 +70,8 @@ void handle_tablet_tool_axis(struct libinput_event *event, wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_WHEEL; wlr_event.wheel_delta = libinput_event_tablet_tool_get_wheel_delta(tevent); } + wlr_log(L_DEBUG, "Tablet tool axis event %d @ %f,%f", + wlr_event.updated_axes, wlr_event.x_mm, wlr_event.y_mm); wl_signal_emit(&wlr_dev->tablet_tool->events.axis, &wlr_event); } |