nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 15:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

types/wlr_tablet_tool: add base wlr_input_device

Browse Source 
wlr_tablet_tool owns its wlr_input_device. It will be initialized when the
tablet tool is initialized, and finished when the tablet tool is destroyed.
This commit is contained in:
Simon Zeni 2022-02-01 11:32:39 -05:00 committed by Kirill Primak
parent a662743610
commit 7dfee50350
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/libinput/tablet_tool.c
View File

@ -75,7 +75,11 @@ struct wlr_tablet *create_libinput_tablet(
} }
struct wlr_tablet *wlr_tablet = &libinput_tablet->wlr_tablet; struct wlr_tablet *wlr_tablet = &libinput_tablet->wlr_tablet;
wlr_tablet_init(wlr_tablet, &tablet_impl); const char *name = libinput_device_get_name(libinput_dev);
wlr_tablet_init(wlr_tablet, &tablet_impl, name);
wlr_tablet->base.vendor = libinput_device_get_id_vendor(libinput_dev);
wlr_tablet->base.product = libinput_device_get_id_product(libinput_dev);
struct udev_device *udev = libinput_device_get_udev_device(libinput_dev); struct udev_device *udev = libinput_device_get_udev_device(libinput_dev);
char **dst = wl_array_add(&wlr_tablet->paths, sizeof(char *)); char **dst = wl_array_add(&wlr_tablet->paths, sizeof(char *));

2
backend/wayland/tablet_v2.c
View File

@ -909,7 +909,7 @@ static void handle_tab_added(void *data,
return; return;
} }
zwp_tablet_v2_set_user_data(id, wlr_dev->tablet); zwp_tablet_v2_set_user_data(id, wlr_dev->tablet);
wlr_tablet_init(wlr_dev->tablet, NULL); wlr_tablet_init(wlr_dev->tablet, NULL, wlr_dev->name);
zwp_tablet_v2_add_listener(id, &tablet_listener, dev); zwp_tablet_v2_add_listener(id, &tablet_listener, dev);
} }

2
include/wlr/interfaces/wlr_tablet_tool.h
View File

@ -16,7 +16,7 @@ struct wlr_tablet_impl {
}; };
void wlr_tablet_init(struct wlr_tablet *tablet, void wlr_tablet_init(struct wlr_tablet *tablet,
const struct wlr_tablet_impl *impl); const struct wlr_tablet_impl *impl, const char *name);
void wlr_tablet_destroy(struct wlr_tablet *tablet); void wlr_tablet_destroy(struct wlr_tablet *tablet);
#endif #endif

2
include/wlr/types/wlr_tablet_tool.h
View File

@ -60,6 +60,8 @@ struct wlr_tablet_tool {
struct wlr_tablet_impl; struct wlr_tablet_impl;
struct wlr_tablet { struct wlr_tablet {
struct wlr_input_device base;
const struct wlr_tablet_impl *impl; const struct wlr_tablet_impl *impl;
struct { struct {

8
types/wlr_tablet_tool.c
View File

@ -1,11 +1,16 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_tablet_tool.h> #include <wlr/interfaces/wlr_tablet_tool.h>
#include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_tool.h>
void wlr_tablet_init(struct wlr_tablet *tablet, void wlr_tablet_init(struct wlr_tablet *tablet,
const struct wlr_tablet_impl *impl) { const struct wlr_tablet_impl *impl, const char *name) {
wlr_input_device_init(&tablet->base, WLR_INPUT_DEVICE_TABLET_TOOL, NULL,
name);
tablet->base.tablet = tablet;
tablet->impl = impl; tablet->impl = impl;
wl_signal_init(&tablet->events.axis); wl_signal_init(&tablet->events.axis);
wl_signal_init(&tablet->events.proximity); wl_signal_init(&tablet->events.proximity);
@ -25,6 +30,7 @@ void wlr_tablet_destroy(struct wlr_tablet *tablet) {
} }
wl_array_release(&tablet->paths); wl_array_release(&tablet->paths);
wlr_input_device_finish(&tablet->base);
if (tablet->impl && tablet->impl->destroy) { if (tablet->impl && tablet->impl->destroy) {
tablet->impl->destroy(tablet); tablet->impl->destroy(tablet);
} else { } else {