fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-24 19:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tablet: move the libwacom stylus query out into the caller

Browse source 
Better re-usability of the WacomStylus struct in subsequent patches.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1218>
This commit is contained in:
Peter Hutterer 2025-03-05 12:01:26 +10:00
parent 8974a15178
commit 28e50024ab
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/evdev-tablet.c
View file

@ -31,6 +31,8 @@
#if HAVE_LIBWACOM
#include <libwacom/libwacom.h>
#else
typedef void * WacomStylus;
#endif
enum notify {
@ -1020,24 +1022,15 @@ copy_button_cap(const struct tablet_dispatch *tablet,
static inline bool
tool_set_bits_from_libwacom(const struct tablet_dispatch *tablet,
struct libinput_tablet_tool *tool)
struct libinput_tablet_tool *tool,
const WacomStylus *s)
{
bool rc = false;
#if HAVE_LIBWACOM
WacomDeviceDatabase *db;
const WacomStylus *s = NULL;
int code;
WacomStylusType type;
WacomAxisTypeFlags axes;
db = tablet_libinput_context(tablet)->libwacom.db;
if (!db)
return rc;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
s = libwacom_stylus_get_for_id(db, tool->tool_id);
#pragma GCC diagnostic pop
if (!s)
return rc;
@ -1091,14 +1084,15 @@ tool_set_bits_from_libwacom(const struct tablet_dispatch *tablet,
static void
tool_set_bits(const struct tablet_dispatch *tablet,
struct libinput_tablet_tool *tool)
struct libinput_tablet_tool *tool,
const WacomStylus *s)
{
enum libinput_tablet_tool_type type = tool->type;
copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_X);
copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_Y);
if (tool_set_bits_from_libwacom(tablet, tool))
if (s && tool_set_bits_from_libwacom(tablet, tool, s))
return;
/* If we don't have libwacom, we simply copy any axis we have on the
@ -1278,6 +1272,17 @@ tablet_new_tool(struct tablet_dispatch *tablet,
uint32_t serial)
{
struct libinput_tablet_tool *tool = zalloc(sizeof *tool);
const WacomStylus *s = NULL;
#if HAVE_LIBWACOM
WacomDeviceDatabase *db;
db = tablet_libinput_context(tablet)->libwacom.db;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
if (db)
s = libwacom_stylus_get_for_id(db, tool_id);
#pragma GCC diagnostic pop
#endif
*tool = (struct libinput_tablet_tool) {
.type = type,
@ -1297,7 +1302,7 @@ tablet_new_tool(struct tablet_dispatch *tablet,
};
tool_init_pressure_thresholds(tablet, tool, &tool->pressure.threshold);
tool_set_bits(tablet, tool);
tool_set_bits(tablet, tool, s);
return tool;
}