frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: add "tablet" into the tablet device names 

Changes the device name from "xwayland-stylus" to "xwayland-tablet stylus".
This doesn't fully address #26 but it goes a little step into making it more
human-readable.

https://gitlab.freedesktop.org/wayland/wayland/issues/26

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Peter Hutterer 2018-06-11 09:04:22 +10:00
parent ec7e2b54c5
commit 0170e200f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xwayland/xwayland-input.c
View File

@ -1389,19 +1389,19 @@ tablet_handle_done(void *data, struct zwp_tablet_v2 *tablet)
struct xwl_seat *xwl_seat = xwl_tablet->seat; struct xwl_seat *xwl_seat = xwl_tablet->seat;
if (xwl_seat->stylus == NULL) { if (xwl_seat->stylus == NULL) {
xwl_seat->stylus = add_device(xwl_seat, "xwayland-stylus", xwl_tablet_proc); xwl_seat->stylus = add_device(xwl_seat, "xwayland-tablet stylus", xwl_tablet_proc);
ActivateDevice(xwl_seat->stylus, TRUE); ActivateDevice(xwl_seat->stylus, TRUE);
} }
EnableDevice(xwl_seat->stylus, TRUE); EnableDevice(xwl_seat->stylus, TRUE);
if (xwl_seat->eraser == NULL) { if (xwl_seat->eraser == NULL) {
xwl_seat->eraser = add_device(xwl_seat, "xwayland-eraser", xwl_tablet_proc); xwl_seat->eraser = add_device(xwl_seat, "xwayland-tablet eraser", xwl_tablet_proc);
ActivateDevice(xwl_seat->eraser, TRUE); ActivateDevice(xwl_seat->eraser, TRUE);
} }
EnableDevice(xwl_seat->eraser, TRUE); EnableDevice(xwl_seat->eraser, TRUE);
if (xwl_seat->puck == NULL) { if (xwl_seat->puck == NULL) {
xwl_seat->puck = add_device(xwl_seat, "xwayland-cursor", xwl_tablet_proc); xwl_seat->puck = add_device(xwl_seat, "xwayland-tablet cursor", xwl_tablet_proc);
ActivateDevice(xwl_seat->puck, TRUE); ActivateDevice(xwl_seat->puck, TRUE);
} }
EnableDevice(xwl_seat->puck, TRUE); EnableDevice(xwl_seat->puck, TRUE);
@ -2147,7 +2147,7 @@ tablet_pad_done(void *data,
{ {
struct xwl_tablet_pad *pad = data; struct xwl_tablet_pad *pad = data;
pad->xdevice = add_device(pad->seat, "xwayland-pad", pad->xdevice = add_device(pad->seat, "xwayland-tablet-pad",
xwl_tablet_pad_proc); xwl_tablet_pad_proc);
pad->xdevice->public.devicePrivate = pad; pad->xdevice->public.devicePrivate = pad;
ActivateDevice(pad->xdevice, TRUE); ActivateDevice(pad->xdevice, TRUE);