[Git][xorg-team/app/xinput][debian-unstable] 20 commits: Switch to using "#if HAVE

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / xinput

Commits:

29e7ec5a

by Peter Hutterer at 2016-10-24T08:58:22+10:00

Switch to using "#if HAVE_XI..." exclusively

Don't mix  "if" and "ifdef"

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

5ecd774d

by Peter Hutterer at 2017-01-26T10:37:26+10:00

autogen.sh: drop maintainer mode

Missing from 1f812f44a3a22e27de00a447c34657e590231a76

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

d63b2f2d

by Alan Coopersmith at 2017-01-26T10:37:59+10:00

autogen.sh: Honor NOCONFIGURE=1

See http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

fb9cb617

by Peter Hutterer at 2017-01-26T10:38:29+10:00

autogen.sh: use exec instead of waiting for configure to finish

Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

60d812e5

by Emil Velikov at 2017-01-26T10:38:29+10:00

autogen.sh: use quoted string variables

Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

ed8c0865

by Mihail Konev at 2017-01-26T14:00:21+10:00

autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>

98848812

by Peter Hutterer at 2018-01-22T10:24:49+10:00

man: document an example for a set-prop call

Because it's 99% of the use-cases people use libinput for these days.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

3ea8f020

by Peter Hutterer at 2018-09-12T14:49:21+10:00

property: plug a memory leak

Not that it matters since we'll exit after this call anyway, but coverity is
unhappy and that makes us all unhappy, doesn't it?

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

5a8f3121

by Peter Hutterer at 2018-09-13T09:39:22+10:00

test-xi2: add an extra NULL-check

Shuts up coverity because it doesn't know that by the time we get here, we're
guaranteed that the device exists. Otherwise the list() call a few lines above
would've failed and we wouldn't get here.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

c7ca2b99

by Alan Coopersmith at 2018-11-21T17:10:59-08:00

Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

d0a77e79

by Peter Hutterer at 2019-03-27T09:31:35+10:00

Warn if you're running against an XWayland server

Because there's a 99% chance you don't want this.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

cef07c0c

by Peter Hutterer at 2019-07-17T15:25:10+10:00

xinput 1.6.3

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

9580c535

by Timo Aaltonen at 2020-03-24T12:16:08+02:00

Merge branch 'upstream-unstable' into debian-unstable

095d962e
by Timo Aaltonen at 2020-03-24T12:18:17+02:00
```
bump the version
```
bbb423a1
by Timo Aaltonen at 2020-03-24T12:19:09+02:00
```
watch: Fix a typo.
```
5e41d5f4
by Timo Aaltonen at 2020-03-24T12:23:07+02:00
```
control: Use debhelper-compat, bump to 12.
```
0bc70e04
by Timo Aaltonen at 2020-03-24T12:24:18+02:00
```
control: Update Vcs urls.
```
2b0e6eac
by Timo Aaltonen at 2020-03-24T12:24:41+02:00
```
control: Bump policy to 4.5.0.
```
1b00f092
by Timo Aaltonen at 2020-03-24T12:25:44+02:00
```
watch: Update git url.
```
61368913
by Timo Aaltonen at 2020-03-24T12:26:54+02:00
```
release to sid
```

Changes:

autogen.sh

  #! /bin/sh
 -srcdir=`dirname $0`
 +srcdir=`dirname "$0"`
  test -z "$srcdir" && srcdir=.
  ORIGDIR=`pwd`
 -cd $srcdir
 +cd "$srcdir"
  autoreconf -v --install || exit 1
 -cd $ORIGDIR || exit $?
 +cd "$ORIGDIR" || exit $?
 -$srcdir/configure --enable-maintainer-mode "$@"
 +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
 +    git config --local format.subjectPrefix "PATCH app/xinput"
 +if test -z "$NOCONFIGURE"; then
 +    exec "$srcdir"/configure "$@"
 +fi

configure.ac

@@ -22,8 +22,8 @@
  # Initialize Autoconf
  AC_PREREQ([2.60])
 -AC_INIT([xinput], [1.6.2],
 -	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinput])
 +AC_INIT([xinput], [1.6.3],
 +	[https://gitlab.freedesktop.org/xorg/app/xinput/issues], [xinput])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([config.h])

debian/changelog

 -xinput (1.6.2-2) UNRELEASED; urgency=medium
 +xinput (1.6.3-1) unstable; urgency=medium
 +  [ Julien Cristau ]
    * Switch all xorg.freedesktop.org URLs in packaging to https.
 - -- Julien Cristau <jcristau@debian.org>  Sun, 21 Aug 2016 18:09:06 +0200
 +  [ Timo Aaltonen ]
 +  * New upstream release.
 +  * control: Use debhelper-compat, bump to 12.
 +  * control: Update Vcs urls.
 +  * control: Bump policy to 4.5.0.
 +  * watch: Update git url.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 24 Mar 2020 12:26:01 +0200
  xinput (1.6.2-1) unstable; urgency=medium

debian/compat deleted

-9

debian/control

@@ -2,10 +2,9 @@ Source: xinput
  Section: x11
  Priority: optional
  Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 -Standards-Version: 3.9.6
 +Standards-Version: 4.5.0
  Build-Depends:
 - debhelper (>= 9),
 - dh-autoreconf,
 + debhelper-compat (= 12),
   libx11-dev,
   libxi-dev (>= 2:1.5.99.1),
   libxext-dev,
@@ -13,11 +12,9 @@ Build-Depends:
   libxrandr-dev,
   x11proto-input-dev (>= 2.1.99.1),
   pkg-config,
 - automake,
 - autoconf,
   xutils-dev
 -Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/app/xinput
 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xinput.git
 +Vcs-Git: https://salsa.debian.org/xorg-team/app/xinput.git
 +Vcs-Browser: https://salsa.debian.org/xorg-team/app/xinput
  Package: xinput
  Architecture: any

debian/rules

  #!/usr/bin/make -f
  %:
 -	dh $@ --with autoreconf -Bbuild
 +	dh $@ -Bbuild
  override_dh_auto_configure:
  	dh_auto_configure -- \

debian/watch

 -#git=git://anongit.freedesktop.org/xorg/app/xinput
 +#git=https://gitlab.freedesktop.org/xorg/app/xinput
  version=3
  opts=pgpsigurlmangle=s/$/.sig/ \
 -https://xorg.freedesktop.orgreleases/individual/app/ xinput-(.*)\.tar\.gz
 +https://xorg.freedesktop.org/releases/individual/app/ xinput-(.*)\.tar\.gz

man/xinput.man

@@ -87,7 +87,7 @@ instead.
  .B --set\-prop [\-\-type=\fIatom|float|int\fP] [\-\-format=\fI8|16|32\fP] \fIdevice\fP \fIproperty\fP \fIvalue\fP [...]
  Set the property to the given value(s).  If not specified, the format and type
  of the property are left as-is.  The arguments are interpreted according to the
 -property type.
 +property type. See Section \fICHANGING PROPERTIES\fP.
  .PP
  .TP 8
  .B --watch-props \fIdevice\fP
@@ -171,6 +171,31 @@ device.
  .PP
  \fIproperty\fP can be the property as a string or the Atom value.
  .PP
 +.SH "CHANGING PROPERTIES"
 +When xinput should modify an existing driver property value, it is
 +sufficient to provide the device name and property name as string, followed
 +by the new value(s) of the property. For example:
 +.IP
 +\fBxinput set-prop "my device" "my prop" 1 2 3\fB
++
 +.SH "XWAYLAND"
 +Xwayland is an X server that uses a Wayland Compositor as backend.
 +Xwayland acts as translation layer between the X protocol and the Wayland
 +protocol but does not have direct access to the hardware. The X Input
 +Extension devices created by Xwayland ("xwayland-pointer",
 +"xwayland-keyboard", etc.) map to the Wayland protocol devices,
 +not to physical devices.
 +.PP
 +These X Input Extension devices are only visible to other X clients
 +connected to the same Xwayland process. Changing properties on Xwayland
 +devices only affects the behavior of those clients. For example, disabling
 +an Xwayland device with xinput does not disable the device in Wayland-native
 +applications. Other changes may not have any effect at all.
 +.PP
 +In most instances, using xinput with an Xwayland device is indicative of a
 +bug in a shell script and xinput will print a warning. Use the Wayland
 +Compositor's native device configuration methods instead.
++
  .SH "SEE ALSO"
  X(__miscmansuffix__), xset(__appmansuffix__), xrandr(__appmansuffix__)
  .SH COPYRIGHT

src/list.c

@@ -138,7 +138,7 @@ static int list_xi1(Display     *display,
      return EXIT_SUCCESS;
+ }
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
  /* also used from test_xi2.c */
  void
  print_classes_xi2(Display* display, XIAnyClassInfo **classes,
@@ -371,7 +371,7 @@ list(Display	*display,
+     {
          if (format == FORMAT_NONE)
              format = FORMAT_LONG;
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
          if (xinput_version(display) == XI_2_Major)
+         {
              XIDeviceInfo *info = xi2_find_device_info(display, argv[arg_dev]);
@@ -399,7 +399,7 @@ list(Display	*display,
      } else {
          if (format == FORMAT_NONE)
              format = FORMAT_SHORT;
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
          if (xinput_version(display) == XI_2_Major)
              return list_xi2(display, format);
  #endif

src/property.c

@@ -610,19 +610,20 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
          unsigned char *c;
          int16_t *s;
          int32_t *l;
 -    } data;
 +    } data = { NULL };
 +    int rc = EXIT_FAILURE;
      if (argc < 3)
+     {
          fprintf(stderr, "Usage: xinput %s %s\n", n, desc);
 -        return EXIT_FAILURE;
 +        goto out;
+     }
      info = xi2_find_device_info(dpy, argv[0]);
      if (!info)
+     {
          fprintf(stderr, "unable to find device %s\n", argv[0]);
 -        return EXIT_FAILURE;
 +        goto out;
+     }
      name = argv[1];
@@ -631,7 +632,7 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
      if (prop == None) {
          fprintf(stderr, "invalid property '%s'\n", name);
 -        return EXIT_FAILURE;
 +        goto out;
+     }
      float_atom = XInternAtom(dpy, "FLOAT", False);
@@ -643,7 +644,7 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
                            &bytes_after, &data.c) != Success) {
              fprintf(stderr, "failed to get property type and format for '%s'\n",
                      name);
 -            return EXIT_FAILURE;
 +            goto out;
          } else {
              if (type == None)
                  type = old_type;
@@ -657,7 +658,7 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
      if (type == None) {
          fprintf(stderr, "property '%s' doesn't exist, you need to specify "
                  "its type and format\n", name);
 -        return EXIT_FAILURE;
 +        goto out;
+     }
      data.c = calloc(nelements, sizeof(int32_t));
@@ -678,43 +679,45 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
                      break;
                  default:
                      fprintf(stderr, "unexpected size for property %s", name);
 -                    return EXIT_FAILURE;
 +                    goto out;
+             }
          } else if (type == float_atom) {
              if (format != 32) {
                  fprintf(stderr, "unexpected format %d for property '%s'\n",
                          format, name);
 -                return EXIT_FAILURE;
 +                goto out;
+             }
              *(float *)(data.l + i) = strtod(argv[2 + i], &endptr);
              if (endptr == argv[2 + i]) {
                  fprintf(stderr, "argument %s could not be parsed\n", argv[2 + i]);
 -                return EXIT_FAILURE;
 +                goto out;
+             }
          } else if (type == XA_ATOM) {
              if (format != 32) {
                  fprintf(stderr, "unexpected format %d for property '%s'\n",
                          format, name);
 -                return EXIT_FAILURE;
 +                goto out;
+             }
              data.l[i] = parse_atom(dpy, argv[2 + i]);
          } else {
              fprintf(stderr, "unexpected type for property '%s'\n", name);
 -            return EXIT_FAILURE;
 +            goto out;
+         }
+     }
      XIChangeProperty(dpy, info->deviceid, prop, type, format, PropModeReplace,
                            data.c, nelements);
 +    rc = EXIT_SUCCESS;
 +out:
      free(data.c);
 -    return EXIT_SUCCESS;
 +    return rc;
+ }
  #endif
  int list_props(Display *display, int argc, char *argv[], char *name,
                 char *desc)
+ {
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
      if (xinput_version(display) == XI_2_Major)
          return list_props_xi2(display, argc, argv, name, desc);
  #endif
@@ -725,7 +728,7 @@ int list_props(Display *display, int argc, char *argv[], char *name,
  int delete_prop(Display *display, int argc, char *argv[], char *name,
                  char *desc)
+ {
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
      if (xinput_version(display) == XI_2_Major)
          return delete_prop_xi2(display, argc, argv, name, desc);
  #endif
@@ -736,7 +739,7 @@ int delete_prop(Display *display, int argc, char *argv[], char *name,
  static int
  do_set_prop(Display *display, Atom type, int format, int argc, char *argv[], char *name, char *desc)
+ {
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
      if (xinput_version(display) == XI_2_Major)
          return do_set_prop_xi2(display, type, format, argc, argv, name, desc);
  #endif

src/test_xi2.c

@@ -358,6 +358,10 @@ test_xi2(Display	*display,
      if (argc >= 1) {
          XIDeviceInfo *info;
          info = xi2_find_device_info(display, argv[0]);
 +        /* info is alway valid, the list() call exits if the device
 +           cannot be found, but let's shut up coverity */
 +        if (!info)
 +            return EXIT_FAILURE;
          deviceid = info->deviceid;
+     }
@@ -376,7 +380,7 @@ test_xi2(Display	*display,
      XISetMask(m->mask, XI_Leave);
      XISetMask(m->mask, XI_FocusIn);
      XISetMask(m->mask, XI_FocusOut);
 -#ifdef HAVE_XI22
 +#if HAVE_XI22
      XISetMask(m->mask, XI_TouchBegin);
      XISetMask(m->mask, XI_TouchUpdate);
      XISetMask(m->mask, XI_TouchEnd);
@@ -394,7 +398,7 @@ test_xi2(Display	*display,
      XISetMask(m->mask, XI_RawButtonPress);
      XISetMask(m->mask, XI_RawButtonRelease);
      XISetMask(m->mask, XI_RawMotion);
 -#ifdef HAVE_XI22
 +#if HAVE_XI22
      XISetMask(m->mask, XI_RawTouchBegin);
      XISetMask(m->mask, XI_RawTouchUpdate);
      XISetMask(m->mask, XI_RawTouchEnd);

src/xinput.c

@@ -273,7 +273,7 @@ find_device_info(Display	*display,
      return found;
+ }
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
  Bool is_pointer(int use)
+ {
      return use == XIMasterPointer || use == XISlavePointer;
@@ -361,6 +361,26 @@ usage(void)
+     }
+ }
 +static Bool
 +is_xwayland(Display *dpy)
 +{
 +    XDeviceInfo *devices;
 +    int n;
 +    Bool is_xwayland = False;
++
 +    devices = XListInputDevices(dpy, &n);
 +    while (n-- > 0) {
 +        if (strncmp(devices[n].name, "xwayland-", 9) == 0) {
 +            is_xwayland = True;
 +            break;
 +        }
 +    }
++
 +    XFreeDeviceList(devices);
++
 +    return is_xwayland;
 +}
++
  int
  main(int argc, char * argv[])
+ {
@@ -402,6 +422,9 @@ main(int argc, char * argv[])
  	goto out;
+     }
 +    if (is_xwayland(display))
 +        fprintf(stderr, "WARNING: running xinput against an Xwayland server. See the xinput man page for details.\n");
++
      while(driver->func_name) {
  	if (strcmp(driver->func_name, func) == 0) {
  	    int	r = (*driver->func)(display, argc-2, argv+2,

src/xinput.h

@@ -27,7 +27,7 @@
  #include <X11/Xlib.h>
  #include <X11/extensions/XInput.h>
 -#ifdef HAVE_XI2
 +#if HAVE_XI2
  #include <X11/extensions/XInput2.h>
  #endif
  #include <X11/Xutil.h>

[Git][xorg-team/app/xinput][debian-unstable] 20 commits: Switch to using "#if HAVE_XI..." exclusively

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / xinput

Commits:

13 changed files:

Changes: