mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: ignore not supported tablet tools

Browse source 
We currently only support cursor emulation
for absolute motion, thus ignore tools/pens
that use relative motion.

Add a log statement on proximity-in to give
some feedback.
This commit is contained in:
Jens Peters 2024-05-07 19:35:44 +02:00 • committed by Johan Malm
parent 163f11595f
commit f8a7d18cf0
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/input/tablet.h
View file

@ -13,11 +13,11 @@ struct drawing_tablet {
struct wlr_tablet *tablet;
double x, y;
struct {
struct wl_listener proximity;
struct wl_listener axis;
struct wl_listener tip;
struct wl_listener button;
struct wl_listener destroy;
// no interest in proximity events
} handlers;
};

31
src/input/tablet.c
View file

@ -11,6 +11,18 @@
#include "input/cursor.h"
#include "input/tablet.h"
static bool
tool_supports_absolute_motion(struct wlr_tablet_tool *tool)
{
switch (tool->type) {
case WLR_TABLET_TOOL_TYPE_MOUSE:
case WLR_TABLET_TOOL_TYPE_LENS:
return false;
default:
return true;
}
}
static void
adjust_for_tablet_area(double tablet_width, double tablet_height,
struct wlr_fbox box, double *x, double *y)
@ -63,11 +75,28 @@ adjust_for_rotation(enum rotation rotation, double *x, double *y)
}
}
static void
handle_proximity(struct wl_listener *listener, void *data)
{
struct wlr_tablet_tool_proximity_event *ev = data;
if (!tool_supports_absolute_motion(ev->tool)) {
if (ev->state == WLR_TABLET_TOOL_PROXIMITY_IN) {
wlr_log(WLR_INFO, "ignoring not supporting tablet tool");
}
}
}
static void
handle_axis(struct wl_listener *listener, void *data)
{
struct wlr_tablet_tool_axis_event *ev = data;
struct drawing_tablet *tablet = ev->tablet->data;
if (!tool_supports_absolute_motion(ev->tool)) {
return;
}
if (ev->updated_axes & (WLR_TABLET_TOOL_AXIS_X | WLR_TABLET_TOOL_AXIS_Y)) {
if (ev->updated_axes & WLR_TABLET_TOOL_AXIS_X) {
tablet->x = ev->x;
@ -127,6 +156,7 @@ handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&tablet->handlers.tip.link);
wl_list_remove(&tablet->handlers.button.link);
wl_list_remove(&tablet->handlers.proximity.link);
wl_list_remove(&tablet->handlers.axis.link);
wl_list_remove(&tablet->handlers.destroy.link);
free(tablet);
@ -145,6 +175,7 @@ tablet_init(struct seat *seat, struct wlr_input_device *wlr_device)
wlr_log(WLR_INFO, "tablet dimensions: %.2fmm x %.2fmm",
tablet->tablet->width_mm, tablet->tablet->height_mm);
CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, axis);
CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, proximity);
CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, tip);
CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, button);
CONNECT_SIGNAL(wlr_device, &tablet->handlers, destroy);