mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-09 13:29:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use wlr_list for paths, and improve inert resource handling

Browse source
This commit is contained in:
Markus Ongyerth 2018-05-15 16:16:19 +02:00
parent adba68a3c1
commit 0c9a26828a
7 changed files with 55 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backend/libinput/tablet_pad.c
View file

@ -12,23 +12,6 @@
#include "backend/libinput.h"
#include "util/signal.h"
//TODO: Move out
static void add_tablet_path(struct wl_list *list, const char *path) {
struct wlr_tablet_path *tablet_path = calloc(1, sizeof(struct wlr_tablet_path));
if (!tablet_path) {
return;
}
tablet_path->path = strdup(path);
if (!tablet_path->path) {
free(tablet_path);
return;
}
wl_list_insert(list, &tablet_path->link);
}
// FIXME: Decide on how to alloc/count here
static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
struct libinput_device *device, unsigned int index) {
@ -99,9 +82,9 @@ struct wlr_tablet_pad *create_libinput_tablet_pad(
wlr_tablet_pad->strip_count =
libinput_device_tablet_pad_get_num_strips(libinput_dev);
wl_list_init(&wlr_tablet_pad->paths);
wlr_list_init(&wlr_tablet_pad->paths);
struct udev_device *udev = libinput_device_get_udev_device(libinput_dev);
add_tablet_path(&wlr_tablet_pad->paths, udev_device_get_syspath(udev));
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);

16
backend/libinput/tablet_tool.c
View file

@ -13,18 +13,6 @@
#include "backend/libinput.h"
#include "util/signal.h"
//TODO: Move out
static void add_tablet_path(struct wl_list *list, const char *path) {
struct wlr_tablet_path *tablet_path = calloc(1, sizeof(struct wlr_tablet_path));
if (!tablet_path) {
return;
}
tablet_path->path = strdup(path);
wl_list_insert(list, &tablet_path->link);
}
struct wlr_libinput_tablet_tool {
struct wlr_tablet_tool_tool wlr_tool;
@ -91,9 +79,9 @@ struct wlr_tablet_tool *create_libinput_tablet_tool(
}
struct wlr_tablet_tool *wlr_tablet_tool = &libinput_tablet_tool->wlr_tool;
wl_list_init(&wlr_tablet_tool->paths);
wlr_list_init(&wlr_tablet_tool->paths);
struct udev_device *udev = libinput_device_get_udev_device(libinput_dev);
add_tablet_path(&wlr_tablet_tool->paths, udev_device_get_syspath(udev));
wlr_list_push(&wlr_tablet_tool->paths, strdup(udev_device_get_syspath(udev)));
wlr_tablet_tool->name = strdup(libinput_device_get_name(libinput_dev));
wl_list_init(&libinput_tablet_tool->tools);