diff -pruN 0.0.8-1/aclocal.m4 0.0.9-1/aclocal.m4
--- 0.0.8-1/aclocal.m4 2020-05-23 21:35:39.000000000 +0000
+++ 0.0.9-1/aclocal.m4 2022-08-04 12:44:46.000000000 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.16.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -327,7 +327,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -979,12 +979,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
@@ -995,35 +990,6 @@ else
fi
])
-# -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
-#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-AC_CONFIG_HEADERS($@)])
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should simply use the 'AC][_PROG_CC' macro instead.
-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-but upon 'ac_cv_prog_cc_stdc'.])])
-
-AC_DEFUN([AM_C_PROTOTYPES],
- [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
diff -pruN 0.0.8-1/ChangeLog 0.0.9-1/ChangeLog
--- 0.0.8-1/ChangeLog 2020-05-23 16:33:46.000000000 +0000
+++ 0.0.9-1/ChangeLog 2022-08-05 14:24:59.000000000 +0000
@@ -1,3 +1,10 @@
+Version 0.0.9 -- 5 Aug 2022
+
+ * Resync with libinput 1.21.0
+ * With libinput 1.21: New option --enable-dwtp
+ * Add new option --disable-mouse-reporting.
+ If you use it, please tell me why!
+
Version 0.0.8 -- 23 May 2020
* Resync with libinput 1.15.5
diff -pruN 0.0.8-1/configure 0.0.9-1/configure
--- 0.0.8-1/configure 2020-05-25 11:08:57.000000000 +0000
+++ 0.0.9-1/configure 2022-08-04 12:44:46.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for consolation 0.0.8.
+# Generated by GNU Autoconf 2.69 for consolation 0.0.9.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='consolation'
PACKAGE_TARNAME='consolation'
-PACKAGE_VERSION='0.0.8'
-PACKAGE_STRING='consolation 0.0.8'
+PACKAGE_VERSION='0.0.9'
+PACKAGE_STRING='consolation 0.0.9'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures consolation 0.0.8 to adapt to many kinds of systems.
+\`configure' configures consolation 0.0.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1317,7 +1317,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of consolation 0.0.8:";;
+ short | recursive ) echo "Configuration of consolation 0.0.9:";;
esac
cat <<\_ACEOF
@@ -1424,7 +1424,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-consolation configure 0.0.8
+consolation configure 0.0.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1479,7 +1479,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by consolation $as_me 0.0.8, which was
+It was created by consolation $as_me 0.0.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2034,12 +2034,7 @@ program_transform_name=`$as_echo "$progr
am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
@@ -2344,7 +2339,7 @@ fi
# Define the identity of the package.
PACKAGE='consolation'
- VERSION='0.0.8'
+ VERSION='0.0.9'
cat >>confdefs.h <<_ACEOF
@@ -3603,6 +3598,321 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinput >= 1.21" >&5
+$as_echo_n "checking for libinput >= 1.21... " >&6; }
+
+if test -n "$LIBINPUT_CFLAGS"; then
+ pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.21") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.21" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBINPUT_LIBS"; then
+ pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.21") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.21" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 1.21" 2>&1`
+ else
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 1.21" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBINPUT_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinput >= 1.15" >&5
+$as_echo_n "checking for libinput >= 1.15... " >&6; }
+
+if test -n "$LIBINPUT_CFLAGS"; then
+ pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.15\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.15") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.15" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBINPUT_LIBS"; then
+ pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.15\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.15") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.15" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 1.15" 2>&1`
+ else
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 1.15" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBINPUT_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinput >= 1.5" >&5
+$as_echo_n "checking for libinput >= 1.5... " >&6; }
+
+if test -n "$LIBINPUT_CFLAGS"; then
+ pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.5" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBINPUT_LIBS"; then
+ pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.5" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 1.5" 2>&1`
+ else
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 1.5" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBINPUT_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (libinput >= 1.5) were not met:
+
+$LIBINPUT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBINPUT_CFLAGS
+and LIBINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBINPUT_CFLAGS
+and LIBINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ LIBINPUT_CFLAGS=$pkg_cv_LIBINPUT_CFLAGS
+ LIBINPUT_LIBS=$pkg_cv_LIBINPUT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinput >= 1.5" >&5
+$as_echo_n "checking for libinput >= 1.5... " >&6; }
+
+if test -n "$LIBINPUT_CFLAGS"; then
+ pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.5" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBINPUT_LIBS"; then
+ pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.5" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 1.5" 2>&1`
+ else
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 1.5" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBINPUT_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (libinput >= 1.5) were not met:
+
+$LIBINPUT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBINPUT_CFLAGS
+and LIBINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBINPUT_CFLAGS
+and LIBINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ LIBINPUT_CFLAGS=$pkg_cv_LIBINPUT_CFLAGS
+ LIBINPUT_LIBS=$pkg_cv_LIBINPUT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+else
+ LIBINPUT_CFLAGS=$pkg_cv_LIBINPUT_CFLAGS
+ LIBINPUT_LIBS=$pkg_cv_LIBINPUT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBINPUT_1_15 /**/" >>confdefs.h
+
+fi
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinput >= 1.15" >&5
$as_echo_n "checking for libinput >= 1.15... " >&6; }
@@ -3854,6 +4164,18 @@ $as_echo "yes" >&6; }
$as_echo "#define HAVE_LIBINPUT_1_15 /**/" >>confdefs.h
fi
+else
+ LIBINPUT_CFLAGS=$pkg_cv_LIBINPUT_CFLAGS
+ LIBINPUT_LIBS=$pkg_cv_LIBINPUT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBINPUT_1_21 /**/" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBINPUT_1_15 /**/" >>confdefs.h
+
+fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
@@ -4133,6 +4455,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -4568,7 +4891,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by consolation $as_me 0.0.8, which was
+This file was extended by consolation $as_me 0.0.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4634,7 +4957,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-consolation config.status 0.0.8
+consolation config.status 0.0.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -pruN 0.0.8-1/configure.ac 0.0.9-1/configure.ac
--- 0.0.8-1/configure.ac 2020-05-01 11:44:02.000000000 +0000
+++ 0.0.9-1/configure.ac 2022-08-04 12:44:38.000000000 +0000
@@ -1,19 +1,22 @@
AC_PREREQ([2.69])
-AC_INIT([consolation], [0.0.8])
+AC_INIT([consolation], [0.0.9])
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS([src/config.h])
# Check for programs
AC_PROG_CC
PKG_PROG_PKG_CONFIG()
-PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.15],
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.21],
+ [AC_DEFINE([HAVE_LIBINPUT_1_21],[],[libinput version is >= 1.21])]
[AC_DEFINE([HAVE_LIBINPUT_1_15],[],[libinput version is >= 1.15])],
- [PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.5])])
+ [PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.15],
+ [AC_DEFINE([HAVE_LIBINPUT_1_15],[],[libinput version is >= 1.15])],
+ [PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.5])])])
PKG_CHECK_MODULES(LIBUDEV, [libudev])
PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
diff -pruN 0.0.8-1/consolation.8 0.0.9-1/consolation.8
--- 0.0.8-1/consolation.8 2020-06-01 17:39:08.000000000 +0000
+++ 0.0.9-1/consolation.8 2022-08-05 14:25:06.000000000 +0000
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8.
-.TH CONSOLATION "8" "June 2020" "Debian" "System Administration Utilities"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
+.TH CONSOLATION "8" "August 2022" "Debian" "System Administration Utilities"
.SH NAME
consolation -- copy-paste for the Linux console
.SH SYNOPSIS
@@ -27,6 +27,9 @@
Button names are 'BTN_LEFT', 'BTN_MIDDLE', 'BTN_RIGHT'.
Other evdev button names are also supported.
+ By default, if the terminal requests mouse report, mouse actions
+ are reported to the terminal instead of being performed.
+
It supports all the standard libinput options.
.PP
.TP
@@ -92,22 +95,24 @@ is not explicitly specified it is left a
.PP
Other options:
.TP
-\fB\-\-word\-chars=\fR.... List of characters that make up words.
+\fB\-\-word\-chars=\fR.... list of characters that make up words.
.IP
Ranges (a\-z, A\-Z, 0\-9 etc.) are allowed.
.PP
.TP
-\fB\-\-grab\fR .......... Exclusively grab all opened devices.
+\fB\-\-grab\fR .......... exclusively grab all opened devices.
+.TP
+\fB\-\-map\fR button=action .... set button to action.
.TP
-\fB\-\-map\fR button=action set button to action.
+\fB\-\-no\-daemon\fR ..... do not detach and run in the background.
.TP
-\fB\-\-no\-daemon\fR...... Do not detach and run in the background.
+\fB\-\-disable\-mouse\-reporting\fR .... disable mouse reporting.
.TP
-\fB\-\-verbose\fR ....... Print debugging output.
+\fB\-\-verbose\fR ....... print debugging output.
.TP
-\fB\-\-version\fR ....... Print version information.
+\fB\-\-version\fR ....... print version information.
.TP
-\fB\-\-help\fR .......... Print this help.
+\fB\-\-help\fR .......... print this help.
.SH LICENSE
Copyright \(co 2016 Bill Allombert
diff -pruN 0.0.8-1/debian/changelog 0.0.9-1/debian/changelog
--- 0.0.8-1/debian/changelog 2020-06-03 13:37:41.000000000 +0000
+++ 0.0.9-1/debian/changelog 2022-08-04 12:57:54.000000000 +0000
@@ -1,3 +1,13 @@
+consolation (0.0.9-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/control:
+ - Bump Standards-Version to 4.6.0
+ - Build-Depends on debhelper-compat (= 13)
+ - Add Rules-Requires-Root: no
+
+ -- Bill Allombert Thu, 04 Aug 2022 14:57:54 +0200
+
consolation (0.0.8-1) unstable; urgency=medium
* New upstream release
diff -pruN 0.0.8-1/debian/control 0.0.9-1/debian/control
--- 0.0.8-1/debian/control 2020-05-25 11:45:14.000000000 +0000
+++ 0.0.9-1/debian/control 2022-08-04 12:57:54.000000000 +0000
@@ -2,8 +2,9 @@ Source: consolation
Section: misc
Priority: optional
Maintainer: Bill Allombert
-Build-Depends: debhelper-compat (= 12), pkg-config, libinput-dev (>= 1.5), libudev-dev, libevdev-dev (>= 0.4), help2man
-Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13), pkg-config, libinput-dev (>= 1.5), libudev-dev, libevdev-dev (>= 0.4), help2man
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
Homepage: https://salsa.debian.org/consolation-team/consolation/
Package: consolation
diff -pruN 0.0.8-1/debian/copyright 0.0.9-1/debian/copyright
--- 0.0.8-1/debian/copyright 2016-08-07 12:00:53.000000000 +0000
+++ 0.0.9-1/debian/copyright 2022-08-04 12:57:54.000000000 +0000
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: consolation
-Source: https://alioth.debian.org/projects/consolation/
+Source: https://salsa.debian.org/consolation-team/consolation/
Files: *
Copyright: 2016 Bill Allombert
diff -pruN 0.0.8-1/LICENSE 0.0.9-1/LICENSE
--- 0.0.8-1/LICENSE 2016-08-06 12:07:13.000000000 +0000
+++ 0.0.9-1/LICENSE 2022-08-04 12:44:38.000000000 +0000
@@ -10,10 +10,9 @@ Copyright © 2016 Bill Allombert
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
- Floor, Boston, MA 02110-1301, USA.
+ Check the License for details. You should have received a copy of it, along
+ with the package; see the file 'COPYING'. If not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
This work is based on event-debug from libinput, which is:
diff -pruN 0.0.8-1/Makefile.in 0.0.9-1/Makefile.in
--- 0.0.8-1/Makefile.in 2020-05-25 10:54:47.000000000 +0000
+++ 0.0.9-1/Makefile.in 2022-08-04 12:44:47.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
@@ -196,6 +196,8 @@ am__relativize = \
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.xz
DIST_TARGETS = dist-xz
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -585,7 +587,7 @@ distcheck: dist
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
diff -pruN 0.0.8-1/README 0.0.9-1/README
--- 0.0.8-1/README 2020-05-23 16:33:46.000000000 +0000
+++ 0.0.9-1/README 2022-08-05 14:24:59.000000000 +0000
@@ -26,6 +26,9 @@
Button names are 'BTN_LEFT', 'BTN_MIDDLE', 'BTN_RIGHT'.
Other evdev button names are also supported.
+ By default, if the terminal requests mouse report, mouse actions
+ are reported to the terminal instead of being performed.
+
It supports all the standard libinput options.
[LICENSE]
diff -pruN 0.0.8-1/src/config.h.in 0.0.9-1/src/config.h.in
--- 0.0.8-1/src/config.h.in 2020-05-23 21:36:28.000000000 +0000
+++ 0.0.9-1/src/config.h.in 2022-08-04 12:44:50.000000000 +0000
@@ -3,6 +3,9 @@
/* libinput version is >= 1.15 */
#undef HAVE_LIBINPUT_1_15
+/* libinput version is >= 1.21 */
+#undef HAVE_LIBINPUT_1_21
+
/* Name of package */
#undef PACKAGE
diff -pruN 0.0.8-1/src/consolation.h 0.0.9-1/src/consolation.h
--- 0.0.8-1/src/consolation.h 2020-05-01 20:24:13.000000000 +0000
+++ 0.0.9-1/src/consolation.h 2022-08-04 12:44:38.000000000 +0000
@@ -18,6 +18,7 @@
/* options */
extern int nodaemon;
+extern int do_mouse_reporting;
enum current_button {
BUTTON_LEFT,
diff -pruN 0.0.8-1/src/input.c 0.0.9-1/src/input.c
--- 0.0.8-1/src/input.c 2020-05-23 16:33:46.000000000 +0000
+++ 0.0.9-1/src/input.c 2022-08-05 14:24:59.000000000 +0000
@@ -47,6 +47,7 @@
int nodaemon = false;
unsigned int screen_width;
unsigned int screen_height;
+int do_mouse_reporting = true;
enum mouse_reporting_mode mouse_reporting = MOUSE_REPORTING_OFF;
static struct tools_options options;
@@ -248,6 +249,10 @@ usage(void)
"--disable-middlebutton.... enable/disable middle button emulation\n"
"--enable-dwt\n"
"--disable-dwt.... enable/disable disable-while-typing\n"
+#ifdef HAVE_LIBINPUT_1_21
+ "--enable-dwtp\n"
+ "--disable-dwtp.... enable/disable disable-while-trackpointing\n"
+#endif
#ifdef HAVE_LIBINPUT_1_15
"--enable-scroll-button-lock\n"
"--disable-scroll-button-lock.... enable/disable the scroll button lock\n"
@@ -263,14 +268,15 @@ usage(void)
"is not explicitly specified it is left at each device's default.\n"
"\n"
"Other options:\n"
- "--word-chars=.... List of characters that make up words.\n"
+ "--word-chars=.... list of characters that make up words.\n"
" Ranges (a-z, A-Z, 0-9 etc.) are allowed.\n"
- "--grab .......... Exclusively grab all opened devices.\n"
- "--map button=action set button to action.\n"
- "--no-daemon...... Do not detach and run in the background.\n"
- "--verbose ....... Print debugging output.\n"
- "--version ....... Print version information.\n"
- "--help .......... Print this help.\n",
+ "--grab .......... exclusively grab all opened devices.\n"
+ "--map button=action .... set button to action.\n"
+ "--no-daemon ..... do not detach and run in the background.\n"
+ "--disable-mouse-reporting .... disable mouse reporting.\n"
+ "--verbose ....... print debugging output.\n"
+ "--version ....... print version information.\n"
+ "--help .......... print this help.\n",
program_invocation_short_name);
return 1;
}
@@ -318,7 +324,8 @@ parse_args(int argc, char **argv)
OPT_HELP,
OPT_VERBOSE,
OPT_VERSION,
- OPT_WORD_CHARS
+ OPT_WORD_CHARS,
+ OPT_DISABLE_MOUSE_REPORTING
};
static struct option opts[] = {
CONFIGURATION_OPTIONS,
@@ -331,6 +338,7 @@ parse_args(int argc, char **argv)
{ "verbose", no_argument, 0, OPT_VERBOSE },
{ "version", no_argument, 0, OPT_VERSION },
{ "word-chars", required_argument, 0, OPT_WORD_CHARS },
+ { "disable-mouse-reporting", no_argument, 0, OPT_DISABLE_MOUSE_REPORTING },
{ 0, 0, 0, 0}
};
@@ -397,6 +405,9 @@ parse_args(int argc, char **argv)
action_map[button - 0x100] = action - 0x100;
}
break;
+ case OPT_DISABLE_MOUSE_REPORTING:
+ do_mouse_reporting = false;
+ break;
default:
if (tools_parse_option(c, optarg, &options) != 0) {
usage();
diff -pruN 0.0.8-1/src/Makefile.in 0.0.9-1/src/Makefile.in
--- 0.0.8-1/src/Makefile.in 2020-05-25 11:05:55.000000000 +0000
+++ 0.0.9-1/src/Makefile.in 2022-08-04 12:44:47.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
diff -pruN 0.0.8-1/src/selection.c 0.0.9-1/src/selection.c
--- 0.0.8-1/src/selection.c 2019-07-17 18:04:18.000000000 +0000
+++ 0.0.9-1/src/selection.c 2022-08-04 12:44:38.000000000 +0000
@@ -38,7 +38,7 @@ void
set_screen_size_and_mouse_reporting(void)
{
struct winsize s;
- unsigned char request = TIOCL_GETMOUSEREPORTING;
+ unsigned char request = MOUSE_REPORTING_OFF;
int fd = open("/dev/tty0",O_RDONLY);
if (fd == -1)
{
@@ -52,10 +52,14 @@ set_screen_size_and_mouse_reporting(void
screen_width = s.ws_col;
screen_height = s.ws_row;
}
- if (ioctl(fd, TIOCLINUX, &request))
+ if (do_mouse_reporting)
{
- perror("TIOCLINUX, TIOCL_GETMOUSEREPORTING");
- request = MOUSE_REPORTING_OFF;
+ request = TIOCL_GETMOUSEREPORTING;
+ if (ioctl(fd, TIOCLINUX, &request))
+ {
+ perror("TIOCLINUX, TIOCL_GETMOUSEREPORTING");
+ request = MOUSE_REPORTING_OFF;
+ }
}
close(fd);
if (request >= MOUSE_REPORTING_MODE_COUNT)
diff -pruN 0.0.8-1/src/shared.c 0.0.9-1/src/shared.c
--- 0.0.8-1/src/shared.c 2020-05-02 09:11:54.000000000 +0000
+++ 0.0.9-1/src/shared.c 2022-08-04 12:49:58.000000000 +0000
@@ -1,5 +1,5 @@
/* Adapted from test/shared.c from the libinput distribution */
-/* tools/shared.c 1.15.5:
+/* tools/shared.c 1.21.0:
*
* Copyright © 2014 Red Hat, Inc.
* Modifications: Copyright © 2019 Bill Allombert
@@ -28,12 +28,13 @@
#include
#include
#include
+#include
#include
#include
-#include
#include
#include
#include
+#include
#include
@@ -76,6 +77,7 @@ tools_init_options(struct tools_options
options->left_handed = -1;
options->middlebutton = -1;
options->dwt = -1;
+ options->dwtp = -1;
options->click_method = -1;
options->scroll_method = -1;
options->scroll_button = -1;
@@ -144,6 +146,16 @@ tools_parse_option(int option,
case OPT_DWT_DISABLE:
options->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
break;
+ case OPT_DWTP_ENABLE:
+#ifdef HAVE_LIBINPUT_1_21
+ options->dwtp = LIBINPUT_CONFIG_DWTP_ENABLED;
+#endif
+ break;
+ case OPT_DWTP_DISABLE:
+#ifdef HAVE_LIBINPUT_1_21
+ options->dwtp = LIBINPUT_CONFIG_DWTP_DISABLED;
+#endif
+ break;
case OPT_CLICK_METHOD:
if (!optarg)
return 1;
@@ -394,6 +406,11 @@ tools_device_apply_config(struct libinpu
if (options->dwt != -1)
libinput_device_config_dwt_set_enabled(device, options->dwt);
+#ifdef HAVE_LIBINPUT_1_21
+ if (options->dwtp != -1)
+ libinput_device_config_dwtp_set_enabled(device, options->dwtp);
+#endif
+
if (options->click_method != (enum libinput_config_click_method)-1)
libinput_device_config_click_set_method(device, options->click_method);
@@ -423,13 +440,16 @@ static char*
find_device(const char *udev_tag)
{
struct udev *udev;
- struct udev_enumerate *e;
+ struct udev_enumerate *e = NULL;
struct udev_list_entry *entry = NULL;
struct udev_device *device;
const char *path, *sysname;
char *device_node = NULL;
udev = udev_new();
+ if (!udev)
+ goto out;
+
e = udev_enumerate_new(udev);
udev_enumerate_add_match_subsystem(e, "input");
udev_enumerate_scan_devices(e);
@@ -454,6 +474,7 @@ find_device(const char *udev_tag)
if (device_node)
break;
}
+out:
udev_enumerate_unref(e);
udev_unref(udev);
@@ -485,6 +506,9 @@ is_touchpad_device(const char *devnode)
return false;
udev = udev_new();
+ if (!udev)
+ goto out;
+
dev = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
if (!dev)
goto out;
diff -pruN 0.0.8-1/src/shared.h 0.0.9-1/src/shared.h
--- 0.0.8-1/src/shared.h 2020-05-01 16:35:14.000000000 +0000
+++ 0.0.9-1/src/shared.h 2022-08-04 12:44:38.000000000 +0000
@@ -1,5 +1,5 @@
/* Adapted from test/shared.h from the libinput distribution */
-/* tools/shared.h 1.15.5:
+/* tools/shared.h 1.21.0:
*
* Copyright © 2014 Red Hat, Inc.
* Modifications: Copyright © 2019 Bill Allombert
@@ -47,6 +47,8 @@ enum configuration_options {
OPT_MIDDLEBUTTON_DISABLE,
OPT_DWT_ENABLE,
OPT_DWT_DISABLE,
+ OPT_DWTP_ENABLE,
+ OPT_DWTP_DISABLE,
OPT_CLICK_METHOD,
OPT_SCROLL_METHOD,
OPT_SCROLL_BUTTON,
@@ -74,6 +76,8 @@ enum configuration_options {
{ "disable-middlebutton", no_argument, 0, OPT_MIDDLEBUTTON_DISABLE }, \
{ "enable-dwt", no_argument, 0, OPT_DWT_ENABLE }, \
{ "disable-dwt", no_argument, 0, OPT_DWT_DISABLE }, \
+ { "enable-dwtp", no_argument, 0, OPT_DWTP_ENABLE }, \
+ { "disable-dwtp", no_argument, 0, OPT_DWTP_DISABLE }, \
{ "enable-scroll-button-lock", no_argument, 0, OPT_SCROLL_BUTTON_LOCK_ENABLE }, \
{ "disable-scroll-button-lock",no_argument, 0, OPT_SCROLL_BUTTON_LOCK_DISABLE }, \
{ "set-click-method", required_argument, 0, OPT_CLICK_METHOD }, \
@@ -106,6 +110,7 @@ struct tools_options {
int scroll_button_lock;
double speed;
int dwt;
+ int dwtp;
enum libinput_config_accel_profile profile;
char disable_pattern[64];
};