xserver: Branch 'master'

[Peter Hutterer]

 hw/xwayland/xwayland-input.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0170e200f546e4b3430bd07a70551436cf44b0be
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jun 11 09:04:22 2018 +1000

    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 at who-t.net>
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 0a37f97bd..a602f0887 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -1389,19 +1389,19 @@ tablet_handle_done(void *data, struct zwp_tablet_v2 *tablet)
     struct xwl_seat *xwl_seat = xwl_tablet->seat;
 
     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);
     }
     EnableDevice(xwl_seat->stylus, TRUE);
 
     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);
     }
     EnableDevice(xwl_seat->eraser, TRUE);
 
     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);
     }
     EnableDevice(xwl_seat->puck, TRUE);
@@ -2147,7 +2147,7 @@ tablet_pad_done(void *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);
     pad->xdevice->public.devicePrivate = pad;
     ActivateDevice(pad->xdevice, TRUE);