Re: [PATCH xserver] xwayland: add "tablet" into the tablet device names
On Mon, 11 Jun 2018 at 11:40, Peter Hutterer wrote: > On Mon, Jun 11, 2018 at 11:21:25AM +0200, Olivier Fourdan wrote: [...] > > > -pad->xdevice = add_device(pad->seat, "xwayland-pad", > > > +pad->xdevice = add_device(pad->seat, "xwayland-tablet-pad", > > > > Previous ones used a space, here you use a dash between > > “xwayland-tablet” and the device type, I'd rather have that > > consistent. > > at the risk of disagreeing over the optical appearance of a velocipede > storage environment: the xwayland-tablet-pad refers to an interface in the > same way as xwayland-tablet does. The space-separated part is the tool which > we only have in the tablet interface, not the tablet-pad one. Oh, I see! There is a logic behind that apparent inconsistency! :) > Not that any of this really matters for the user who sees this :) Indeed, so either way, my R-b remains :) Cheers, Olivier ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH xserver] xwayland: add "tablet" into the tablet device names
On Mon, Jun 11, 2018 at 11:21:25AM +0200, Olivier Fourdan wrote: > Hi Peter, > On Mon, 11 Jun 2018 at 01:12, Peter Hutterer wrote: > > > > 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 > > --- > > hw/xwayland/xwayland-input.c | 8 > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > 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", > > Previous ones used a space, here you use a dash between > “xwayland-tablet” and the device type, I'd rather have that > consistent. at the risk of disagreeing over the optical appearance of a velocipede storage environment: the xwayland-tablet-pad refers to an interface in the same way as xwayland-tablet does. The space-separated part is the tool which we only have in the tablet interface, not the tablet-pad one. Not that any of this really matters for the user who sees this :) Cheers, Peter > > >xwl_tablet_pad_proc); > > pad->xdevice->public.devicePrivate = pad; > > ActivateDevice(pad->xdevice, TRUE); > > -- > > 2.14.4 > > > > ___ > > wayland-devel mailing list > > wayland-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/wayland-devel > > Sounds like a reasonable thing to do... with a pretty low risk. > > With the consistency nit picking addressed: > > Reviewed-by: Olivier Fourdan > > Cheers, > Olivier > ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH xserver] xwayland: add "tablet" into the tablet device names
Hi Peter, On Mon, 11 Jun 2018 at 01:12, Peter Hutterer wrote: > > 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 > --- > hw/xwayland/xwayland-input.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > 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", Previous ones used a space, here you use a dash between “xwayland-tablet” and the device type, I'd rather have that consistent. >xwl_tablet_pad_proc); > pad->xdevice->public.devicePrivate = pad; > ActivateDevice(pad->xdevice, TRUE); > -- > 2.14.4 > > ___ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/wayland-devel Sounds like a reasonable thing to do... with a pretty low risk. With the consistency nit picking addressed: Reviewed-by: Olivier Fourdan Cheers, Olivier ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH xserver] 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 --- hw/xwayland/xwayland-input.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) 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); -- 2.14.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel