From 57babd2e13e4d55230d63687aec0107156fd65f4 Mon Sep 17 00:00:00 2001
From: Markus Ongyerth <ongy@ongy.net>
Date: Fri, 10 May 2019 08:35:23 +0200
Subject: Move initialization of wlr_tablet_pad into types/wlr_tablet_pad
---
backend/libinput/tablet_pad.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'backend')
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index b053b9a0..691bb185 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -75,6 +75,7 @@ struct wlr_tablet_pad *create_libinput_tablet_pad(
wlr_log(WLR_ERROR, "Unable to allocate wlr_tablet_pad");
return NULL;
}
+ wlr_tablet_pad_init(wlr_tablet_pad, NULL);
wlr_tablet_pad->button_count =
libinput_device_tablet_pad_get_num_buttons(libinput_dev);
@@ -83,17 +84,14 @@ struct wlr_tablet_pad *create_libinput_tablet_pad(
wlr_tablet_pad->strip_count =
libinput_device_tablet_pad_get_num_strips(libinput_dev);
- wlr_list_init(&wlr_tablet_pad->paths);
struct udev_device *udev = libinput_device_get_udev_device(libinput_dev);
wlr_list_push(&wlr_tablet_pad->paths, strdup(udev_device_get_syspath(udev)));
- wl_list_init(&wlr_tablet_pad->groups);
int groups = libinput_device_tablet_pad_get_num_mode_groups(libinput_dev);
for (int i = 0; i < groups; ++i) {
add_pad_group_from_libinput(wlr_tablet_pad, libinput_dev, i);
}
- wlr_tablet_pad_init(wlr_tablet_pad, NULL);
return wlr_tablet_pad;
}
--
cgit v1.2.3