summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorAlexandr Shadchin <shadchin@cvs.openbsd.org>2013-11-11 16:52:01 +0000
committerAlexandr Shadchin <shadchin@cvs.openbsd.org>2013-11-11 16:52:01 +0000
commit68b039991d2bc85fee8fdb84e837da7962428597 (patch)
treee0727fff9b236318cf377acfb6f613b4ba689f76 /driver
parent4c6d0b04105955e514d880418ca8d8cae9f873bb (diff)
Update to xf86-input-keyboard 1.8.0.
ok matthieu@
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-input-keyboard/ChangeLog308
-rw-r--r--driver/xf86-input-keyboard/Makefile.in3
-rw-r--r--driver/xf86-input-keyboard/aclocal.m4118
-rw-r--r--driver/xf86-input-keyboard/configure496
-rw-r--r--driver/xf86-input-keyboard/configure.ac18
-rw-r--r--driver/xf86-input-keyboard/man/Makefile.in3
-rw-r--r--driver/xf86-input-keyboard/src/Makefile.am2
-rw-r--r--driver/xf86-input-keyboard/src/Makefile.in5
-rw-r--r--driver/xf86-input-keyboard/src/bsd_KbdMap.c586
-rw-r--r--driver/xf86-input-keyboard/src/bsd_kbd.c124
-rw-r--r--driver/xf86-input-keyboard/src/kbd.c8
-rw-r--r--driver/xf86-input-keyboard/src/xf86OSKbd.h1
12 files changed, 1329 insertions, 343 deletions
diff --git a/driver/xf86-input-keyboard/ChangeLog b/driver/xf86-input-keyboard/ChangeLog
index f64b9183e..d7627d948 100644
--- a/driver/xf86-input-keyboard/ChangeLog
+++ b/driver/xf86-input-keyboard/ChangeLog
@@ -1,3 +1,311 @@
+commit ddeb7940b956682451392717b135be4454b5756e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Nov 1 09:45:21 2013 +1000
+
+ keyboard 1.8.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 014101d157fb7eb54c79fecc424b53ca95f582bc
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun Oct 27 13:53:34 2013 +0100
+
+ Whitespace fixes.
+
+ Replace <SPACE><TAB> with <TAB>.
+ Remove whitespace at end-of-line.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b8f4e7065566512a123c4957ab432cad3e7c688e
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Tue Jul 30 15:07:31 2013 +0200
+
+ Check open() return value.
+
+ Suggested by Walter Harms <wharms@bfs.de>.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dc9486a22f4b7fec2860928c555636bfc9f58741
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:49 2013 +0200
+
+ Factor out common code.
+
+ Suggested by Walter Harms <wharms@bfs.de>.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2d6661d5c7aff662ad76ddb225664260f0a07a1e
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:48 2013 +0200
+
+ Do not assume type in WS_*_MAP_SIZE macros.
+
+ Suggested by Walter Harms <wharms@bfs.de>.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6042ab2647197d9aa09578ed1befe03931737f1c
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:47 2013 +0200
+
+ Add some NetBSD feature detection code.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4f1a3cff9dfbfb33fcc6ff0a4ffd1db106301b97
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:46 2013 +0200
+
+ Move WSCONS case inside switch statement.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 390c4621dd4e2f6070508796385e2d23e5418b89
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:45 2013 +0200
+
+ Improve auto-detection.
+
+ If WSKBDIO_GTYPE succeeds and returns type=0, it is a mux with no
+ keyboard attached. In this case, assume USB.
+
+ >From Jared McNeill <jmcneill@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8ac42401a6db161e0983df17ac1787f164faf2f3
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:44 2013 +0200
+
+ Fix wskbd handling when VT switching.
+
+ When using /dev/wskbd* we need to close the device when VT switching
+ out of X, and open it again when switching back.
+
+ >From Michael Lorenz <macallan@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d61dcfd5c297f405a4c200131e88e5dfc95bfa95
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:43 2013 +0200
+
+ Make OpenKeyboard() warn instead of error out.
+
+ This way we can still setup keyboard map manually by xmodmap(1)
+ etc. on less well supported ports.
+
+ >From Izumi Tsutsui <tsutsui@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e511907a5f7047a9c14b378084525137510511f5
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:42 2013 +0200
+
+ Add WSKBD_TYPE_LK201.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e5ecacb20ad3685d6f422c5ed21632fb8b1f7fa0
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:41 2013 +0200
+
+ Add default device for Protocol "wskbd".
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8879a7682ef94471e907bb660d2b96cc95ed7b81
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:40 2013 +0200
+
+ Recognize WSKBD_TYPE_MAPLE for dreamcast.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f105a796ae29eaaae7c25447734013537fad2a87
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:39 2013 +0200
+
+ Fix a shadowing warning, and add const.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c783746c4f72249645e43c6d96d08cb6c74812d0
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:38 2013 +0200
+
+ Set the version for the keyboard.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 83faa4123ae5d182f936faab77925d45da181f5f
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:37 2013 +0200
+
+ Add a basic map for an LK201 keyboard.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e7ba236dbaf8df9364bf61ef5c3d67d377fbd2ec
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:36 2013 +0200
+
+ Fix scan code 50 key on non-US-USB keyboards.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 60d947b34830b850d53de1ee756502c471796fa9
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:35 2013 +0200
+
+ Add a couple mappings for keys found on Sun keyboards.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0baa215b57d104bf22bc9a179bae3ff413bf055c
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:34 2013 +0200
+
+ Use existing wscons USB keymap for WSKBD_TYPE_MAPLE on dreamcast.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9c6acb2a2a4806d14ce84dcd1fb81268359dbe35
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:33 2013 +0200
+
+ Add translation table for AT/PS2 pseudo XT scancodes.
+
+ Add another translation table to make the modular kbd driver cope with NetBSD's
+ AT/PS2 pseudo XT scancodes. Tested on shark and sgimips with an IBM Model M -
+ this should be tested with more keyboards, there might still be errors in the
+ table.
+
+ >From Michael Lorenz <macallan@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e7a1f964782817acc4807beddc6e6ef1c8d94c96
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:32 2013 +0200
+
+ More ADB fixes.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 42b22d5dc3892309d276df131d35951a79311843
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:31 2013 +0200
+
+ Fixes for the ADB map.
+
+ - map the backspace key to KEY_BackSpace
+ - swap LAlt and LMeta to match the keyboard (Alt=Alt/Option, Meta=Command)
+ - add a keysym for . on the number pad
+ ... so killing the Xserver with Ctrl-Alt-BackSpace works now and the default
+ map matches an US keyboard without any xmodmap stunts.
+
+ >From Michael Lorenz <macallan@NetBSD.org>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b8e12ae87352922eaea305f66ca232ea2a3b2d61
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:30 2013 +0200
+
+ Added keysyms for extra keys on Sun Type 6 USB keyboard.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ad527f5c25984fa023f1be9fcb8e953aa7459e8a
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:29 2013 +0200
+
+ Added keysym for Power keys.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a0eec5ddd0f3b1a23f5fcbaf85cd34680a1944fc
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:28 2013 +0200
+
+ Map the Sun keyboard "help" key.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2d5bc7db251facdb2bb478eaad1dfd820cf28d13
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Mon Jul 29 23:23:27 2013 +0200
+
+ Added some missing keysyms to the ADB keymap.
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit ec3ccb22d4e7348ac537100fcb1b7ddc07df57b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 27 11:13:18 2013 +1000
diff --git a/driver/xf86-input-keyboard/Makefile.in b/driver/xf86-input-keyboard/Makefile.in
index 2994d03c6..ef16689cb 100644
--- a/driver/xf86-input-keyboard/Makefile.in
+++ b/driver/xf86-input-keyboard/Makefile.in
@@ -225,6 +225,7 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OS_FLAGS = @OS_FLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@@ -236,6 +237,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/driver/xf86-input-keyboard/aclocal.m4 b/driver/xf86-input-keyboard/aclocal.m4
index f64a04b22..91089525c 100644
--- a/driver/xf86-input-keyboard/aclocal.m4
+++ b/driver/xf86-input-keyboard/aclocal.m4
@@ -8607,6 +8607,7 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
@@ -8633,8 +8634,12 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -8647,7 +8652,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -8656,34 +8660,32 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -8725,16 +8727,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -8742,28 +8745,67 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])[]dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[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.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -9750,7 +9792,7 @@ AC_SUBST([am__untar])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-dnl
+dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
dnl to deal in the Software without restriction, including without limitation
@@ -9783,10 +9825,10 @@ dnl DEALINGS IN THE SOFTWARE.
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
-# See the "minimum version" comment for each macro you use to see what
+# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.16.2])
+m4_define([vers_have], [1.17.1])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -9806,7 +9848,7 @@ m4_undefine([maj_needed])
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
@@ -11292,18 +11334,18 @@ fi
found="no"
m4_foreach([flag], m4_cdr($@), [
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
fi
PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
- AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+ AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
AC_CACHE_VAL($cacheid,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
@@ -11562,7 +11604,7 @@ dnl
# XORG_RELEASE_VERSION
# --------------------
# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
-
+
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
diff --git a/driver/xf86-input-keyboard/configure b/driver/xf86-input-keyboard/configure
index 82a37d28d..5d4b3bba5 100644
--- a/driver/xf86-input-keyboard/configure
+++ b/driver/xf86-input-keyboard/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-keyboard 1.7.0.
+# Generated by GNU Autoconf 2.69 for xf86-input-keyboard 1.8.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xf86-input-keyboard'
PACKAGE_TARNAME='xf86-input-keyboard'
-PACKAGE_VERSION='1.7.0'
-PACKAGE_STRING='xf86-input-keyboard 1.7.0'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='xf86-input-keyboard 1.8.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -646,6 +646,7 @@ BSD_FALSE
BSD_TRUE
LINUX_FALSE
LINUX_TRUE
+OS_FLAGS
inputdir
XORG_LIBS
XORG_CFLAGS
@@ -668,6 +669,8 @@ FILE_MAN_SUFFIX
LIB_MAN_SUFFIX
APP_MAN_SUFFIX
INSTALL_CMD
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
CHANGELOG_CMD
STRICT_CFLAGS
@@ -807,6 +810,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
XORG_CFLAGS
XORG_LIBS'
@@ -1349,7 +1354,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 xf86-input-keyboard 1.7.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-keyboard 1.8.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1420,7 +1425,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-keyboard 1.7.0:";;
+ short | recursive ) echo "Configuration of xf86-input-keyboard 1.8.0:";;
esac
cat <<\_ACEOF
@@ -1468,6 +1473,10 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
XORG_LIBS linker flags for XORG, overriding pkg-config
@@ -1537,7 +1546,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-keyboard configure 1.7.0
+xf86-input-keyboard configure 1.8.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1861,7 +1870,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 xf86-input-keyboard $as_me 1.7.0, which was
+It was created by xf86-input-keyboard $as_me 1.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2690,7 +2699,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-keyboard'
- VERSION='1.7.0'
+ VERSION='1.8.0'
cat >>confdefs.h <<_ACEOF
@@ -11515,6 +11524,11 @@ fi
+
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11627,7 +11641,6 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
@@ -11722,18 +11735,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wall"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wall" >&5
-$as_echo_n "checking if $CC supports-Wall... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5
+$as_echo_n "checking if $CC supports -Wall... " >&6; }
cacheid=xorg_cv_cc_flag__Wall
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -11840,18 +11853,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wpointer-arith"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-arith" >&5
-$as_echo_n "checking if $CC supports-Wpointer-arith... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; }
cacheid=xorg_cv_cc_flag__Wpointer_arith
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -11958,18 +11971,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-declarations"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-declarations" >&5
-$as_echo_n "checking if $CC supports-Wmissing-declarations... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5
+$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_declarations
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12076,18 +12089,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wformat=2"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat=2" >&5
-$as_echo_n "checking if $CC supports-Wformat=2... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5
+$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
cacheid=xorg_cv_cc_flag__Wformat_2
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12125,18 +12138,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wformat"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat" >&5
-$as_echo_n "checking if $CC supports-Wformat... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5
+$as_echo_n "checking if $CC supports -Wformat... " >&6; }
cacheid=xorg_cv_cc_flag__Wformat
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12245,18 +12258,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wstrict-prototypes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wstrict-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wstrict-prototypes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
cacheid=xorg_cv_cc_flag__Wstrict_prototypes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12363,18 +12376,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-prototypes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wmissing-prototypes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_prototypes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12481,18 +12494,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wnested-externs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnested-externs" >&5
-$as_echo_n "checking if $CC supports-Wnested-externs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5
+$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
cacheid=xorg_cv_cc_flag__Wnested_externs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12599,18 +12612,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wbad-function-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wbad-function-cast" >&5
-$as_echo_n "checking if $CC supports-Wbad-function-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5
+$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wbad_function_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12717,18 +12730,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wold-style-definition"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wold-style-definition" >&5
-$as_echo_n "checking if $CC supports-Wold-style-definition... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5
+$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; }
cacheid=xorg_cv_cc_flag__Wold_style_definition
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12835,18 +12848,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wdeclaration-after-statement" >&5
-$as_echo_n "checking if $CC supports-Wdeclaration-after-statement... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12957,18 +12970,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wunused"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wunused" >&5
-$as_echo_n "checking if $CC supports-Wunused... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5
+$as_echo_n "checking if $CC supports -Wunused... " >&6; }
cacheid=xorg_cv_cc_flag__Wunused
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13075,18 +13088,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wuninitialized"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wuninitialized" >&5
-$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5
+$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; }
cacheid=xorg_cv_cc_flag__Wuninitialized
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13193,18 +13206,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wshadow"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wshadow" >&5
-$as_echo_n "checking if $CC supports-Wshadow... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5
+$as_echo_n "checking if $CC supports -Wshadow... " >&6; }
cacheid=xorg_cv_cc_flag__Wshadow
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13311,18 +13324,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wcast-qual"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wcast-qual" >&5
-$as_echo_n "checking if $CC supports-Wcast-qual... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5
+$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; }
cacheid=xorg_cv_cc_flag__Wcast_qual
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13429,18 +13442,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-noreturn"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-noreturn" >&5
-$as_echo_n "checking if $CC supports-Wmissing-noreturn... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_noreturn
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13547,18 +13560,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-format-attribute"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-format-attribute" >&5
-$as_echo_n "checking if $CC supports-Wmissing-format-attribute... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13677,18 +13690,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=implicit"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=implicit" >&5
-$as_echo_n "checking if $CC supports-Werror=implicit... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5
+$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_implicit
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13726,18 +13739,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13844,18 +13857,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=nonnull"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=nonnull" >&5
-$as_echo_n "checking if $CC supports-Werror=nonnull... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5
+$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_nonnull
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -13962,18 +13975,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=init-self"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=init-self" >&5
-$as_echo_n "checking if $CC supports-Werror=init-self... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5
+$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_init_self
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14080,18 +14093,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=main"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=main" >&5
-$as_echo_n "checking if $CC supports-Werror=main... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5
+$as_echo_n "checking if $CC supports -Werror=main... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_main
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14198,18 +14211,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=missing-braces"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=missing-braces" >&5
-$as_echo_n "checking if $CC supports-Werror=missing-braces... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5
+$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_missing_braces
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14316,18 +14329,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=sequence-point"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=sequence-point" >&5
-$as_echo_n "checking if $CC supports-Werror=sequence-point... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5
+$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_sequence_point
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14434,18 +14447,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=return-type"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=return-type" >&5
-$as_echo_n "checking if $CC supports-Werror=return-type... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5
+$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_return_type
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14483,18 +14496,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14601,18 +14614,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=trigraphs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=trigraphs" >&5
-$as_echo_n "checking if $CC supports-Werror=trigraphs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5
+$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_trigraphs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14719,18 +14732,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=array-bounds"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=array-bounds" >&5
-$as_echo_n "checking if $CC supports-Werror=array-bounds... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5
+$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_array_bounds
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14837,18 +14850,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=write-strings"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=write-strings" >&5
-$as_echo_n "checking if $CC supports-Werror=write-strings... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5
+$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_write_strings
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14955,18 +14968,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=address"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=address" >&5
-$as_echo_n "checking if $CC supports-Werror=address... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5
+$as_echo_n "checking if $CC supports -Werror=address... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_address
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15073,18 +15086,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=int-to-pointer-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=int-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=int-to-pointer-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15122,18 +15135,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15240,18 +15253,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=pointer-to-int-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=pointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=pointer-to-int-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15361,18 +15374,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wimplicit"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wimplicit" >&5
-$as_echo_n "checking if $CC supports-Wimplicit... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5
+$as_echo_n "checking if $CC supports -Wimplicit... " >&6; }
cacheid=xorg_cv_cc_flag__Wimplicit
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15479,18 +15492,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wnonnull"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnonnull" >&5
-$as_echo_n "checking if $CC supports-Wnonnull... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5
+$as_echo_n "checking if $CC supports -Wnonnull... " >&6; }
cacheid=xorg_cv_cc_flag__Wnonnull
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15597,18 +15610,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Winit-self"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Winit-self" >&5
-$as_echo_n "checking if $CC supports-Winit-self... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5
+$as_echo_n "checking if $CC supports -Winit-self... " >&6; }
cacheid=xorg_cv_cc_flag__Winit_self
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15715,18 +15728,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmain"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmain" >&5
-$as_echo_n "checking if $CC supports-Wmain... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5
+$as_echo_n "checking if $CC supports -Wmain... " >&6; }
cacheid=xorg_cv_cc_flag__Wmain
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15833,18 +15846,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-braces"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-braces" >&5
-$as_echo_n "checking if $CC supports-Wmissing-braces... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5
+$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_braces
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15951,18 +15964,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wsequence-point"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wsequence-point" >&5
-$as_echo_n "checking if $CC supports-Wsequence-point... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5
+$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; }
cacheid=xorg_cv_cc_flag__Wsequence_point
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16069,18 +16082,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wreturn-type"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wreturn-type" >&5
-$as_echo_n "checking if $CC supports-Wreturn-type... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5
+$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; }
cacheid=xorg_cv_cc_flag__Wreturn_type
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16187,18 +16200,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wtrigraphs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wtrigraphs" >&5
-$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5
+$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; }
cacheid=xorg_cv_cc_flag__Wtrigraphs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16305,18 +16318,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Warray-bounds"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Warray-bounds" >&5
-$as_echo_n "checking if $CC supports-Warray-bounds... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5
+$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; }
cacheid=xorg_cv_cc_flag__Warray_bounds
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16423,18 +16436,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wwrite-strings"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wwrite-strings" >&5
-$as_echo_n "checking if $CC supports-Wwrite-strings... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5
+$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; }
cacheid=xorg_cv_cc_flag__Wwrite_strings
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16541,18 +16554,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Waddress"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Waddress" >&5
-$as_echo_n "checking if $CC supports-Waddress... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5
+$as_echo_n "checking if $CC supports -Waddress... " >&6; }
cacheid=xorg_cv_cc_flag__Waddress
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16659,18 +16672,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wint-to-pointer-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wint-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Wint-to-pointer-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16777,18 +16790,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wpointer-to-int-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Wpointer-to-int-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16928,18 +16941,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -pedantic"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-pedantic" >&5
-$as_echo_n "checking if $CC supports-pedantic... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5
+$as_echo_n "checking if $CC supports -pedantic... " >&6; }
cacheid=xorg_cv_cc_flag__pedantic
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -17046,18 +17059,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror" >&5
-$as_echo_n "checking if $CC supports-Werror... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
+$as_echo_n "checking if $CC supports -Werror... " >&6; }
cacheid=xorg_cv_cc_flag__Werror
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -17095,18 +17108,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn" >&5
-$as_echo_n "checking if $CC supports-errwarn... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5
+$as_echo_n "checking if $CC supports -errwarn... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -17216,18 +17229,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=attributes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=attributes" >&5
-$as_echo_n "checking if $CC supports-Werror=attributes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
+$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_attributes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -17452,46 +17465,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
$as_echo_n "checking for XORG... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XORG_CFLAGS"; then
- pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XORG_CFLAGS"; then
+ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4 xproto inputproto\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4 xproto inputproto") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.4 xproto inputproto" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XORG_LIBS"; then
- pkg_cv_XORG_LIBS="$XORG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XORG_LIBS"; then
+ pkg_cv_XORG_LIBS="$XORG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4 xproto inputproto\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4 xproto inputproto") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.4 xproto inputproto" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ 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
@@ -17499,9 +17512,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.4 xproto inputproto"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xorg-server >= 1.4 xproto inputproto" 2>&1`
else
- XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.4 xproto inputproto"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xorg-server >= 1.4 xproto inputproto" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
@@ -17515,9 +17528,10 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+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
@@ -17528,14 +17542,14 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
XORG_LIBS=$pkg_cv_XORG_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
# Define a configure option for an alternate input module directory
@@ -17574,6 +17588,22 @@ case $host_os in
porting it." "$LINENO" 5
;;
esac
+case $host_os in
+ netbsd*)
+ case $host in
+ *powerpc-*|*sparc-*|*sparc64-*|*vax-*)
+ OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD"
+ ;;
+ esac
+ case "$(uname -m 2>&1)" in
+ evbarm|sgimips|shark)
+ OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD"
+ ;;
+ esac
+ ;;
+esac
+
+
if test "x$IS_LINUX" = xyes; then
LINUX_TRUE=
LINUX_FALSE='#'
@@ -18158,7 +18188,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-keyboard $as_me 1.7.0, which was
+This file was extended by xf86-input-keyboard $as_me 1.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18224,7 +18254,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="\\
-xf86-input-keyboard config.status 1.7.0
+xf86-input-keyboard config.status 1.8.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/driver/xf86-input-keyboard/configure.ac b/driver/xf86-input-keyboard/configure.ac
index c699f6e2a..8c10bb518 100644
--- a/driver/xf86-input-keyboard/configure.ac
+++ b/driver/xf86-input-keyboard/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-keyboard],
- [1.7.0],
+ [1.8.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-keyboard])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -79,6 +79,22 @@ case $host_os in
porting it.])
;;
esac
+case $host_os in
+ netbsd*)
+ case $host in
+ *powerpc-*|*sparc-*|*sparc64-*|*vax-*)
+ OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD"
+ ;;
+ esac
+ case "$(uname -m 2>&1)" in
+ evbarm|sgimips|shark)
+ OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD"
+ ;;
+ esac
+ ;;
+esac
+AC_SUBST([OS_FLAGS])
+
AM_CONDITIONAL(LINUX, [test "x$IS_LINUX" = xyes])
AM_CONDITIONAL(BSD, [test "x$IS_BSD" = xyes])
AM_CONDITIONAL(SOLARIS, [test "x$IS_SOLARIS" = xyes])
diff --git a/driver/xf86-input-keyboard/man/Makefile.in b/driver/xf86-input-keyboard/man/Makefile.in
index 58ad9eab4..4b3943e17 100644
--- a/driver/xf86-input-keyboard/man/Makefile.in
+++ b/driver/xf86-input-keyboard/man/Makefile.in
@@ -198,6 +198,7 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OS_FLAGS = @OS_FLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@@ -209,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/driver/xf86-input-keyboard/src/Makefile.am b/driver/xf86-input-keyboard/src/Makefile.am
index d5d3ef435..8612c871a 100644
--- a/driver/xf86-input-keyboard/src/Makefile.am
+++ b/driver/xf86-input-keyboard/src/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(OS_FLAGS)
kbd_drv_la_LTLIBRARIES = kbd_drv.la
kbd_drv_la_LDFLAGS = -avoid-version -module
diff --git a/driver/xf86-input-keyboard/src/Makefile.in b/driver/xf86-input-keyboard/src/Makefile.in
index 9e389230d..65e833e7d 100644
--- a/driver/xf86-input-keyboard/src/Makefile.in
+++ b/driver/xf86-input-keyboard/src/Makefile.in
@@ -246,6 +246,7 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OS_FLAGS = @OS_FLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@@ -257,6 +258,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -320,7 +323,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(OS_FLAGS)
kbd_drv_la_LTLIBRARIES = kbd_drv.la
kbd_drv_la_LDFLAGS = -avoid-version -module
kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h \
diff --git a/driver/xf86-input-keyboard/src/bsd_KbdMap.c b/driver/xf86-input-keyboard/src/bsd_KbdMap.c
index 1b5cc3e2f..123ab965b 100644
--- a/driver/xf86-input-keyboard/src/bsd_KbdMap.c
+++ b/driver/xf86-input-keyboard/src/bsd_KbdMap.c
@@ -260,7 +260,7 @@ static CARD8 wsUsbMap[] = {
/* 47 */ KEY_LBrace, /* [ { */
/* 48 */ KEY_RBrace, /* ] } */
/* 49 */ KEY_BSlash, /* \ | */
- /* 50 */ KEY_BSlash2, /* \ _ # ~ on some keyboards */
+ /* 50 */ KEY_BSlash, /* \ _ # ~ on some keyboards */
/* 51 */ KEY_SemiColon, /* ; : */
/* 52 */ KEY_Quote, /* ' " */
/* 53 */ KEY_Tilde, /* ` ~ */
@@ -312,34 +312,34 @@ static CARD8 wsUsbMap[] = {
/* 99 */ KEY_KP_Decimal, /* Keypad . Del */
/* 100 */ KEY_Less, /* < > on some keyboards */
/* 101 */ KEY_Menu, /* Menu */
- /* 102 */ KEY_NOTUSED,
+ /* 102 */ KEY_Power, /* sleep key on Sun USB */
/* 103 */ KEY_KP_Equal, /* Keypad = on Mac keyboards */
- /* 104 */ KEY_NOTUSED,
- /* 105 */ KEY_NOTUSED,
- /* 106 */ KEY_NOTUSED,
- /* 107 */ KEY_NOTUSED,
+ /* 104 */ KEY_F13,
+ /* 105 */ KEY_F14,
+ /* 106 */ KEY_F15,
+ /* 107 */ KEY_F16,
/* 108 */ KEY_NOTUSED,
- /* 109 */ KEY_NOTUSED,
+ /* 109 */ KEY_Power,
/* 110 */ KEY_NOTUSED,
/* 111 */ KEY_NOTUSED,
/* 112 */ KEY_NOTUSED,
/* 113 */ KEY_NOTUSED,
/* 114 */ KEY_NOTUSED,
/* 115 */ KEY_NOTUSED,
- /* 116 */ KEY_NOTUSED,
- /* 117 */ KEY_NOTUSED,
- /* 118 */ KEY_NOTUSED,
- /* 119 */ KEY_NOTUSED,
- /* 120 */ KEY_NOTUSED,
- /* 121 */ KEY_NOTUSED,
- /* 122 */ KEY_NOTUSED,
- /* 123 */ KEY_NOTUSED,
- /* 124 */ KEY_NOTUSED,
- /* 125 */ KEY_NOTUSED,
- /* 126 */ KEY_NOTUSED,
- /* 127 */ KEY_NOTUSED,
- /* 128 */ KEY_NOTUSED,
- /* 129 */ KEY_NOTUSED,
+ /* 116 */ KEY_L7,
+ /* 117 */ KEY_Help,
+ /* 118 */ KEY_L3,
+ /* 119 */ KEY_L5,
+ /* 120 */ KEY_L1,
+ /* 121 */ KEY_L2,
+ /* 122 */ KEY_L4,
+ /* 123 */ KEY_L10,
+ /* 124 */ KEY_L6,
+ /* 125 */ KEY_L8,
+ /* 126 */ KEY_L9,
+ /* 127 */ KEY_Mute,
+ /* 128 */ KEY_AudioRaise,
+ /* 129 */ KEY_AudioLower,
/* 130 */ KEY_NOTUSED,
/* 131 */ KEY_NOTUSED,
/* 132 */ KEY_NOTUSED,
@@ -443,7 +443,7 @@ static CARD8 wsUsbMap[] = {
/* 230 */ KEY_AltLang, /* Right Alt, AKA AltGr */
/* 231 */ KEY_LMeta, /* Right Meta XXX */
};
-#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(unsigned char))
+#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(*wsUsbMap))
static
TransMapRec wsUsb = {
@@ -452,6 +452,239 @@ TransMapRec wsUsb = {
wsUsbMap
};
+static CARD8 wsXtMap[] = {
+ /* 0 */ KEY_NOTUSED,
+ /* 1 */ KEY_Escape,
+ /* 2 */ KEY_1,
+ /* 3 */ KEY_2,
+ /* 4 */ KEY_3,
+ /* 5 */ KEY_4,
+ /* 6 */ KEY_5,
+ /* 7 */ KEY_6,
+ /* 8 */ KEY_7,
+ /* 9 */ KEY_8,
+ /* 10 */ KEY_9,
+ /* 11 */ KEY_0,
+ /* 12 */ KEY_Minus,
+ /* 13 */ KEY_Equal,
+ /* 14 */ KEY_BackSpace,
+ /* 15 */ KEY_Tab,
+ /* 16 */ KEY_Q,
+ /* 17 */ KEY_W,
+ /* 18 */ KEY_E,
+ /* 19 */ KEY_R,
+ /* 20 */ KEY_T,
+ /* 21 */ KEY_Y,
+ /* 22 */ KEY_U,
+ /* 23 */ KEY_I,
+ /* 24 */ KEY_O,
+ /* 25 */ KEY_P,
+ /* 26 */ KEY_LBrace,
+ /* 27 */ KEY_RBrace,
+ /* 28 */ KEY_Enter,
+ /* 29 */ KEY_LCtrl,
+ /* 30 */ KEY_A,
+ /* 31 */ KEY_S,
+ /* 32 */ KEY_D,
+ /* 33 */ KEY_F,
+ /* 34 */ KEY_G,
+ /* 35 */ KEY_H,
+ /* 36 */ KEY_J,
+ /* 37 */ KEY_K,
+ /* 38 */ KEY_L,
+ /* 39 */ KEY_SemiColon,
+ /* 40 */ KEY_Quote,
+ /* 41 */ KEY_Tilde,
+ /* 42 */ KEY_ShiftL,
+ /* 43 */ KEY_BSlash,
+ /* 44 */ KEY_Z,
+ /* 45 */ KEY_X,
+ /* 46 */ KEY_C,
+ /* 47 */ KEY_V,
+ /* 48 */ KEY_B,
+ /* 49 */ KEY_N,
+ /* 50 */ KEY_M,
+ /* 51 */ KEY_Comma,
+ /* 52 */ KEY_Period,
+ /* 53 */ KEY_Slash,
+ /* 54 */ KEY_ShiftR,
+ /* 55 */ KEY_KP_Multiply,
+ /* 56 */ KEY_Alt,
+ /* 57 */ KEY_Space,
+ /* 58 */ KEY_CapsLock,
+ /* 59 */ KEY_F1,
+ /* 60 */ KEY_F2,
+ /* 61 */ KEY_F3,
+ /* 62 */ KEY_F4,
+ /* 63 */ KEY_F5,
+ /* 64 */ KEY_F6,
+ /* 65 */ KEY_F7,
+ /* 66 */ KEY_F8,
+ /* 67 */ KEY_F9,
+ /* 68 */ KEY_F10,
+ /* 69 */ KEY_NumLock,
+ /* 70 */ KEY_ScrollLock,
+ /* 71 */ KEY_KP_7,
+ /* 72 */ KEY_KP_8,
+ /* 73 */ KEY_KP_9,
+ /* 74 */ KEY_KP_Minus,
+ /* 75 */ KEY_KP_4,
+ /* 76 */ KEY_KP_5,
+ /* 77 */ KEY_KP_6,
+ /* 78 */ KEY_KP_Plus,
+ /* 79 */ KEY_KP_1,
+ /* 80 */ KEY_KP_2,
+ /* 81 */ KEY_KP_3,
+ /* 82 */ KEY_KP_0,
+ /* 83 */ KEY_KP_Decimal,
+ /* 84 */ KEY_NOTUSED,
+ /* 85 */ KEY_NOTUSED,
+ /* 86 */ KEY_Less, /* backslash on uk, < on german */
+ /* 87 */ KEY_F11,
+ /* 88 */ KEY_F12,
+ /* 89 */ KEY_NOTUSED,
+ /* 90 */ KEY_NOTUSED,
+ /* 91 */ KEY_NOTUSED,
+ /* 92 */ KEY_NOTUSED,
+ /* 93 */ KEY_NOTUSED,
+ /* 94 */ KEY_NOTUSED,
+ /* 95 */ KEY_NOTUSED,
+ /* 96 */ KEY_NOTUSED,
+ /* 97 */ KEY_NOTUSED,
+ /* 98 */ KEY_NOTUSED,
+ /* 99 */ KEY_NOTUSED,
+ /* 100 */ KEY_NOTUSED,
+ /* 101 */ KEY_NOTUSED,
+ /* 102 */ KEY_NOTUSED,
+ /* 103 */ KEY_NOTUSED,
+ /* 104 */ KEY_NOTUSED,
+ /* 105 */ KEY_NOTUSED,
+ /* 106 */ KEY_NOTUSED,
+ /* 107 */ KEY_NOTUSED,
+ /* 108 */ KEY_NOTUSED,
+ /* 109 */ KEY_NOTUSED,
+ /* 110 */ KEY_NOTUSED,
+ /* 111 */ KEY_NOTUSED,
+ /* 112 */ KEY_NOTUSED,
+ /* 113 */ KEY_NOTUSED,
+ /* 114 */ KEY_NOTUSED,
+ /* 115 */ KEY_NOTUSED,
+ /* 116 */ KEY_NOTUSED,
+ /* 117 */ KEY_NOTUSED,
+ /* 118 */ KEY_NOTUSED,
+ /* 119 */ KEY_NOTUSED,
+ /* 120 */ KEY_NOTUSED,
+ /* 121 */ KEY_NOTUSED,
+ /* 122 */ KEY_NOTUSED,
+ /* 123 */ KEY_NOTUSED,
+ /* 124 */ KEY_NOTUSED,
+ /* 125 */ KEY_NOTUSED,
+ /* 126 */ KEY_NOTUSED,
+ /* 127 */ KEY_Pause,
+ /* 128 */ KEY_NOTUSED,
+ /* 129 */ KEY_NOTUSED,
+ /* 130 */ KEY_NOTUSED,
+ /* 131 */ KEY_NOTUSED,
+ /* 132 */ KEY_NOTUSED,
+ /* 133 */ KEY_NOTUSED,
+ /* 134 */ KEY_NOTUSED,
+ /* 135 */ KEY_NOTUSED,
+ /* 136 */ KEY_NOTUSED,
+ /* 137 */ KEY_NOTUSED,
+ /* 138 */ KEY_NOTUSED,
+ /* 139 */ KEY_NOTUSED,
+ /* 140 */ KEY_NOTUSED,
+ /* 141 */ KEY_NOTUSED,
+ /* 142 */ KEY_NOTUSED,
+ /* 143 */ KEY_NOTUSED,
+ /* 144 */ KEY_NOTUSED,
+ /* 145 */ KEY_NOTUSED,
+ /* 146 */ KEY_NOTUSED,
+ /* 147 */ KEY_NOTUSED,
+ /* 148 */ KEY_NOTUSED,
+ /* 149 */ KEY_NOTUSED,
+ /* 150 */ KEY_NOTUSED,
+ /* 151 */ KEY_NOTUSED,
+ /* 152 */ KEY_NOTUSED,
+ /* 153 */ KEY_NOTUSED,
+ /* 154 */ KEY_NOTUSED,
+ /* 155 */ KEY_NOTUSED,
+ /* 156 */ KEY_KP_Enter,
+ /* 157 */ KEY_RCtrl,
+ /* 158 */ KEY_NOTUSED,
+ /* 159 */ KEY_NOTUSED,
+ /* 160 */ KEY_Mute,
+ /* 161 */ KEY_NOTUSED,
+ /* 162 */ KEY_NOTUSED,
+ /* 163 */ KEY_NOTUSED,
+ /* 164 */ KEY_NOTUSED,
+ /* 165 */ KEY_NOTUSED,
+ /* 166 */ KEY_NOTUSED,
+ /* 167 */ KEY_NOTUSED,
+ /* 168 */ KEY_NOTUSED,
+ /* 169 */ KEY_NOTUSED,
+ /* 170 */ KEY_Print,
+ /* 171 */ KEY_NOTUSED,
+ /* 172 */ KEY_NOTUSED,
+ /* 173 */ KEY_NOTUSED,
+ /* 174 */ KEY_AudioLower,
+ /* 175 */ KEY_AudioRaise,
+ /* 176 */ KEY_NOTUSED,
+ /* 177 */ KEY_NOTUSED,
+ /* 178 */ KEY_NOTUSED,
+ /* 179 */ KEY_NOTUSED,
+ /* 180 */ KEY_NOTUSED,
+ /* 181 */ KEY_KP_Divide,
+ /* 182 */ KEY_NOTUSED,
+ /* 183 */ KEY_Print,
+ /* 184 */ KEY_AltLang,
+ /* 185 */ KEY_NOTUSED,
+ /* 186 */ KEY_NOTUSED,
+ /* 187 */ KEY_NOTUSED,
+ /* 188 */ KEY_NOTUSED,
+ /* 189 */ KEY_NOTUSED,
+ /* 190 */ KEY_NOTUSED,
+ /* 191 */ KEY_NOTUSED,
+ /* 192 */ KEY_NOTUSED,
+ /* 193 */ KEY_NOTUSED,
+ /* 194 */ KEY_NOTUSED,
+ /* 195 */ KEY_NOTUSED,
+ /* 196 */ KEY_NOTUSED,
+ /* 197 */ KEY_NOTUSED,
+ /* 198 */ KEY_NOTUSED,
+ /* 199 */ KEY_Home,
+ /* 200 */ KEY_Up,
+ /* 201 */ KEY_PgUp,
+ /* 202 */ KEY_NOTUSED,
+ /* 203 */ KEY_Left,
+ /* 204 */ KEY_NOTUSED,
+ /* 205 */ KEY_Right,
+ /* 206 */ KEY_NOTUSED,
+ /* 207 */ KEY_End,
+ /* 208 */ KEY_Down,
+ /* 209 */ KEY_PgDown,
+ /* 210 */ KEY_Insert,
+ /* 211 */ KEY_Delete,
+ /* 212 */ KEY_NOTUSED,
+ /* 213 */ KEY_NOTUSED,
+ /* 214 */ KEY_NOTUSED,
+ /* 215 */ KEY_NOTUSED,
+ /* 216 */ KEY_NOTUSED,
+ /* 217 */ KEY_NOTUSED,
+ /* 218 */ KEY_NOTUSED,
+ /* 219 */ KEY_LMeta,
+ /* 220 */ KEY_RMeta,
+ /* 221 */ KEY_Menu,
+};
+#define WS_XT_MAP_SIZE (sizeof(wsXtMap)/sizeof(*wsXtMap))
+
+static
+TransMapRec wsXt = {
+ 0,
+ WS_XT_MAP_SIZE,
+ wsXtMap
+};
+
/* Map for adb keyboards */
static CARD8 wsAdbMap[] = {
/* 0 */ KEY_A,
@@ -505,14 +738,14 @@ static CARD8 wsAdbMap[] = {
/* 48 */ KEY_Tab,
/* 49 */ KEY_Space,
/* 50 */ KEY_Tilde,
- /* 51 */ KEY_Delete,
+ /* 51 */ KEY_BackSpace,
/* 52 */ KEY_AltLang,
/* 53 */ KEY_Escape,
/* 54 */ KEY_LCtrl,
- /* 55 */ KEY_Alt,
+ /* 55 */ KEY_LMeta,
/* 56 */ KEY_ShiftL,
/* 57 */ KEY_CapsLock,
- /* 58 */ KEY_LMeta,
+ /* 58 */ KEY_Alt,
/* 59 */ KEY_Left,
/* 60 */ KEY_Right,
/* 61 */ KEY_Down,
@@ -525,7 +758,7 @@ static CARD8 wsAdbMap[] = {
/* 68 */ KEY_NOTUSED,
/* 69 */ KEY_KP_Plus,
/* 70 */ KEY_NOTUSED,
- /* 71 */ KEY_UNKNOWN, /* Clear */
+ /* 71 */ KEY_NumLock, /* Clear */
/* 72 */ KEY_NOTUSED,
/* 73 */ KEY_NOTUSED,
/* 74 */ KEY_NOTUSED,
@@ -549,7 +782,7 @@ static CARD8 wsAdbMap[] = {
/* 92 */ KEY_KP_9,
/* 93 */ KEY_NOTUSED,
/* 94 */ KEY_NOTUSED,
- /* 95 */ KEY_UNKNOWN, /* Keypad , */
+ /* 95 */ KEY_KP_Decimal, /* Keypad , */
/* 96 */ KEY_F5,
/* 97 */ KEY_F6,
/* 98 */ KEY_F7,
@@ -559,26 +792,31 @@ static CARD8 wsAdbMap[] = {
/* 102 */ KEY_NOTUSED,
/* 103 */ KEY_F11,
/* 104 */ KEY_NOTUSED,
- /* 105 */ KEY_NOTUSED,
+ /* 105 */ KEY_Print,
/* 106 */ KEY_KP_Enter,
- /* 107 */ KEY_NOTUSED,
+ /* 107 */ KEY_ScrollLock,
/* 108 */ KEY_NOTUSED,
/* 109 */ KEY_F10,
/* 110 */ KEY_NOTUSED,
/* 111 */ KEY_F12,
/* 112 */ KEY_NOTUSED,
- /* 113 */ KEY_NOTUSED,
- /* 114 */ KEY_NOTUSED,
+ /* 113 */ KEY_Pause,
+ /* 114 */ KEY_Insert,
/* 115 */ KEY_Home,
/* 116 */ KEY_PgUp,
- /* 117 */ KEY_NOTUSED,
+ /* 117 */ KEY_Delete,
/* 118 */ KEY_F4,
/* 119 */ KEY_End,
/* 120 */ KEY_F2,
/* 121 */ KEY_PgDown,
- /* 122 */ KEY_F1
+ /* 122 */ KEY_F1,
+ /* 123 */ KEY_NOTUSED,
+ /* 124 */ KEY_NOTUSED,
+ /* 125 */ KEY_NOTUSED,
+ /* 126 */ KEY_NOTUSED,
+ /* 127 */ KEY_Power
};
-#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(unsigned char))
+#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(*wsAdbMap))
static
TransMapRec wsAdb = {
@@ -587,6 +825,270 @@ TransMapRec wsAdb = {
wsAdbMap
};
+/* Map for LK201 keyboards */
+static CARD8 wsLk201Map[] = {
+ /* 0 */ KEY_F1,
+ /* 1 */ KEY_F2,
+ /* 2 */ KEY_F3,
+ /* 3 */ KEY_F4,
+ /* 4 */ KEY_F5,
+ /* 5 */ KEY_NOTUSED,
+ /* 6 */ KEY_NOTUSED,
+ /* 7 */ KEY_NOTUSED,
+ /* 8 */ KEY_NOTUSED,
+ /* 9 */ KEY_NOTUSED,
+ /* 10 */ KEY_NOTUSED,
+ /* 11 */ KEY_NOTUSED,
+ /* 12 */ KEY_NOTUSED,
+ /* 13 */ KEY_NOTUSED,
+ /* 14 */ KEY_F6,
+ /* 15 */ KEY_F7,
+ /* 16 */ KEY_F8,
+ /* 17 */ KEY_F9,
+ /* 18 */ KEY_F10,
+ /* 19 */ KEY_NOTUSED,
+ /* 20 */ KEY_NOTUSED,
+ /* 21 */ KEY_NOTUSED,
+ /* 22 */ KEY_NOTUSED,
+ /* 23 */ KEY_NOTUSED,
+ /* 24 */ KEY_NOTUSED,
+ /* 25 */ KEY_NOTUSED,
+ /* 26 */ KEY_NOTUSED,
+ /* 27 */ KEY_F11,
+ /* 28 */ KEY_F12,
+ /* 29 */ KEY_F13,
+ /* 30 */ KEY_F14,
+ /* 31 */ KEY_NOTUSED,
+ /* 32 */ KEY_NOTUSED,
+ /* 33 */ KEY_NOTUSED,
+ /* 34 */ KEY_NOTUSED,
+ /* 35 */ KEY_NOTUSED,
+ /* 36 */ KEY_NOTUSED,
+ /* 37 */ KEY_NOTUSED,
+ /* 38 */ KEY_Help,
+ /* 39 */ KEY_F16, /* Do */
+ /* 40 */ KEY_NOTUSED,
+ /* 41 */ KEY_NOTUSED,
+ /* 42 */ KEY_F17,
+ /* 43 */ KEY_L8, /* F18 */
+ /* 44 */ KEY_L9, /* F19 */
+ /* 45 */ KEY_L10, /* F20 */
+ /* 46 */ KEY_NOTUSED,
+ /* 47 */ KEY_NOTUSED,
+ /* 48 */ KEY_NOTUSED,
+ /* 49 */ KEY_NOTUSED,
+ /* 50 */ KEY_NOTUSED,
+ /* 51 */ KEY_NOTUSED,
+ /* 52 */ KEY_Home, /* Find */
+ /* 53 */ KEY_Insert, /* Insert Here */
+ /* 54 */ KEY_Delete, /* Re-move */
+ /* 55 */ KEY_End, /* Select */
+ /* 56 */ KEY_PgUp, /* Prev-Screen */
+ /* 57 */ KEY_PgDown, /* Next-Screen */
+ /* 58 */ KEY_NOTUSED,
+ /* 59 */ KEY_NOTUSED,
+ /* 60 */ KEY_KP_0,
+ /* 61 */ KEY_NOTUSED,
+ /* 62 */ KEY_KP_Decimal,
+ /* 63 */ KEY_KP_Enter,
+ /* 64 */ KEY_KP_1,
+ /* 65 */ KEY_KP_2,
+ /* 66 */ KEY_KP_3,
+ /* 67 */ KEY_KP_4,
+ /* 68 */ KEY_KP_5,
+ /* 69 */ KEY_KP_6,
+ /* 70 */ KEY_KP_Plus, /* KP Comma */
+ /* 71 */ KEY_KP_7,
+ /* 72 */ KEY_KP_8,
+ /* 73 */ KEY_KP_9,
+ /* 74 */ KEY_KP_Minus,
+ /* 75 */ KEY_L1, /* PF1 */
+ /* 76 */ KEY_L2, /* PF2 */
+ /* 77 */ KEY_L3, /* PF3 */
+ /* 78 */ KEY_L4, /* PF4 */
+ /* 79 */ KEY_NOTUSED,
+ /* 80 */ KEY_NOTUSED,
+ /* 81 */ KEY_Left,
+ /* 82 */ KEY_Right,
+ /* 83 */ KEY_Down,
+ /* 84 */ KEY_Up,
+ /* 85 */ KEY_NOTUSED,
+ /* 86 */ KEY_NOTUSED,
+ /* 87 */ KEY_NOTUSED,
+ /* 88 */ KEY_ShiftL,
+ /* 89 */ KEY_LCtrl,
+ /* 90 */ KEY_CapsLock,
+ /* 91 */ KEY_Alt, /* Compose */
+ /* 92 */ KEY_NOTUSED,
+ /* 93 */ KEY_NOTUSED,
+ /* 94 */ KEY_NOTUSED,
+ /* 95 */ KEY_NOTUSED,
+ /* 96 */ KEY_NOTUSED,
+ /* 97 */ KEY_NOTUSED,
+ /* 98 */ KEY_NOTUSED,
+ /* 99 */ KEY_NOTUSED,
+ /* 100 */ KEY_NOTUSED,
+ /* 101 */ KEY_NOTUSED,
+ /* 102 */ KEY_Delete,
+ /* 103 */ KEY_Enter,
+ /* 104 */ KEY_Tab,
+ /* 105 */ KEY_Escape, /* tilde */
+ /* 106 */ KEY_1,
+ /* 107 */ KEY_Q,
+ /* 108 */ KEY_A,
+ /* 109 */ KEY_Z,
+ /* 110 */ KEY_NOTUSED,
+ /* 111 */ KEY_2,
+ /* 112 */ KEY_W,
+ /* 113 */ KEY_S,
+ /* 114 */ KEY_X,
+ /* 115 */ KEY_Less,
+ /* 116 */ KEY_NOTUSED,
+ /* 117 */ KEY_3,
+ /* 118 */ KEY_E,
+ /* 119 */ KEY_D,
+ /* 120 */ KEY_C,
+ /* 121 */ KEY_NOTUSED,
+ /* 122 */ KEY_4,
+ /* 123 */ KEY_R,
+ /* 124 */ KEY_F,
+ /* 125 */ KEY_V,
+ /* 126 */ KEY_Space,
+ /* 127 */ KEY_NOTUSED,
+ /* 128 */ KEY_5,
+ /* 129 */ KEY_T,
+ /* 130 */ KEY_G,
+ /* 131 */ KEY_B,
+ /* 132 */ KEY_NOTUSED,
+ /* 133 */ KEY_6,
+ /* 134 */ KEY_Y,
+ /* 135 */ KEY_H,
+ /* 136 */ KEY_N,
+ /* 137 */ KEY_NOTUSED,
+ /* 138 */ KEY_7,
+ /* 139 */ KEY_U,
+ /* 140 */ KEY_J,
+ /* 141 */ KEY_M,
+ /* 142 */ KEY_NOTUSED,
+ /* 143 */ KEY_8,
+ /* 144 */ KEY_I,
+ /* 145 */ KEY_K,
+ /* 146 */ KEY_Comma,
+ /* 147 */ KEY_NOTUSED,
+ /* 148 */ KEY_9,
+ /* 149 */ KEY_O,
+ /* 150 */ KEY_L,
+ /* 151 */ KEY_Period,
+ /* 152 */ KEY_NOTUSED,
+ /* 153 */ KEY_0,
+ /* 154 */ KEY_P,
+ /* 155 */ KEY_NOTUSED,
+ /* 156 */ KEY_SemiColon,
+ /* 157 */ KEY_Slash,
+ /* 158 */ KEY_NOTUSED,
+ /* 159 */ KEY_Equal,
+ /* 160 */ KEY_RBrace,
+ /* 161 */ KEY_BSlash,
+ /* 162 */ KEY_NOTUSED,
+ /* 163 */ KEY_Minus,
+ /* 164 */ KEY_LBrace,
+ /* 165 */ KEY_Quote,
+ /* 166 */ KEY_NOTUSED,
+ /* 167 */ KEY_NOTUSED,
+ /* 168 */ KEY_NOTUSED,
+ /* 169 */ KEY_NOTUSED,
+ /* 170 */ KEY_NOTUSED,
+ /* 171 */ KEY_NOTUSED,
+ /* 172 */ KEY_NOTUSED,
+ /* 173 */ KEY_NOTUSED,
+ /* 174 */ KEY_NOTUSED,
+ /* 175 */ KEY_NOTUSED,
+ /* 176 */ KEY_NOTUSED,
+ /* 177 */ KEY_NOTUSED,
+ /* 178 */ KEY_NOTUSED,
+ /* 179 */ KEY_NOTUSED,
+ /* 180 */ KEY_NOTUSED,
+ /* 181 */ KEY_NOTUSED,
+ /* 182 */ KEY_NOTUSED,
+ /* 183 */ KEY_NOTUSED,
+ /* 184 */ KEY_NOTUSED,
+ /* 185 */ KEY_NOTUSED,
+ /* 186 */ KEY_NOTUSED,
+ /* 187 */ KEY_NOTUSED,
+ /* 188 */ KEY_NOTUSED,
+ /* 189 */ KEY_NOTUSED,
+ /* 190 */ KEY_NOTUSED,
+ /* 191 */ KEY_NOTUSED,
+ /* 192 */ KEY_NOTUSED,
+ /* 193 */ KEY_NOTUSED,
+ /* 194 */ KEY_NOTUSED,
+ /* 195 */ KEY_NOTUSED,
+ /* 196 */ KEY_NOTUSED,
+ /* 197 */ KEY_NOTUSED,
+ /* 198 */ KEY_NOTUSED,
+ /* 199 */ KEY_NOTUSED,
+ /* 200 */ KEY_NOTUSED,
+ /* 201 */ KEY_NOTUSED,
+ /* 202 */ KEY_NOTUSED,
+ /* 203 */ KEY_NOTUSED,
+ /* 204 */ KEY_NOTUSED,
+ /* 205 */ KEY_NOTUSED,
+ /* 206 */ KEY_NOTUSED,
+ /* 207 */ KEY_NOTUSED,
+ /* 208 */ KEY_NOTUSED,
+ /* 209 */ KEY_NOTUSED,
+ /* 210 */ KEY_NOTUSED,
+ /* 211 */ KEY_NOTUSED,
+ /* 212 */ KEY_NOTUSED,
+ /* 213 */ KEY_NOTUSED,
+ /* 214 */ KEY_NOTUSED,
+ /* 215 */ KEY_NOTUSED,
+ /* 216 */ KEY_NOTUSED,
+ /* 217 */ KEY_NOTUSED,
+ /* 218 */ KEY_NOTUSED,
+ /* 219 */ KEY_NOTUSED,
+ /* 220 */ KEY_NOTUSED,
+ /* 221 */ KEY_NOTUSED,
+ /* 222 */ KEY_NOTUSED,
+ /* 223 */ KEY_NOTUSED,
+ /* 224 */ KEY_NOTUSED,
+ /* 225 */ KEY_NOTUSED,
+ /* 226 */ KEY_NOTUSED,
+ /* 227 */ KEY_NOTUSED,
+ /* 228 */ KEY_NOTUSED,
+ /* 229 */ KEY_NOTUSED,
+ /* 230 */ KEY_NOTUSED,
+ /* 231 */ KEY_NOTUSED,
+ /* 232 */ KEY_NOTUSED,
+ /* 233 */ KEY_NOTUSED,
+ /* 234 */ KEY_NOTUSED,
+ /* 235 */ KEY_NOTUSED,
+ /* 236 */ KEY_NOTUSED,
+ /* 237 */ KEY_NOTUSED,
+ /* 238 */ KEY_NOTUSED,
+ /* 239 */ KEY_NOTUSED,
+ /* 240 */ KEY_NOTUSED,
+ /* 241 */ KEY_NOTUSED,
+ /* 242 */ KEY_NOTUSED,
+ /* 243 */ KEY_NOTUSED,
+ /* 244 */ KEY_NOTUSED,
+ /* 245 */ KEY_NOTUSED,
+ /* 246 */ KEY_NOTUSED,
+ /* 247 */ KEY_NOTUSED,
+ /* 248 */ KEY_NOTUSED,
+ /* 249 */ KEY_NOTUSED,
+ /* 250 */ KEY_NOTUSED,
+ /* 251 */ KEY_NOTUSED,
+};
+#define WS_LK201_MAP_SIZE (sizeof(wsLk201Map)/sizeof(*wsLk201Map))
+
+static
+TransMapRec wsLk201 = {
+ 0,
+ WS_LK201_MAP_SIZE,
+ wsLk201Map
+};
+
static CARD8 wsSunMap[] = {
/* 0x00 */ KEY_Help,
/* 0x01 */ KEY_L1, /* stop */
@@ -636,7 +1138,7 @@ static CARD8 wsSunMap[] = {
/* 0x2d */ KEY_Mute, /* Audio Mute */
/* 0x2e */ KEY_KP_Divide,
/* 0x2f */ KEY_KP_Multiply,
- /* 0x30 */ KEY_NOTUSED,
+ /* 0x30 */ KEY_Power,
/* 0x31 */ KEY_L5, /* front */
/* 0x32 */ KEY_KP_Decimal,
/* 0x33 */ KEY_L6, /* copy */
@@ -706,7 +1208,7 @@ static CARD8 wsSunMap[] = {
/* 0x73 */ KEY_NOTUSED,
/* 0x74 */ KEY_NOTUSED,
/* 0x75 */ KEY_NOTUSED,
- /* 0x76 */ KEY_NOTUSED, /* help */
+ /* 0x76 */ KEY_Help, /* help */
/* 0x77 */ KEY_CapsLock,
/* 0x78 */ KEY_LMeta,
/* 0x79 */ KEY_Space,
@@ -717,7 +1219,7 @@ static CARD8 wsSunMap[] = {
/* 0x7e */ KEY_NOTUSED,
/* 0x7f */ KEY_NOTUSED
};
-#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(unsigned char))
+#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(*wsSunMap))
static
TransMapRec wsSun = {
@@ -855,9 +1357,12 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
switch (pKbd->wsKbdType) {
case WSKBD_TYPE_PC_XT:
case WSKBD_TYPE_PC_AT:
- pKbd->RemapScanCode = ATScancode;
+ pKbd->scancodeMap = &wsXt;
break;
case WSKBD_TYPE_USB:
+#ifdef WSKBD_TYPE_MAPLE
+ case WSKBD_TYPE_MAPLE:
+#endif
pKbd->scancodeMap = &wsUsb;
break;
#ifdef WSKBD_TYPE_ADB
@@ -865,6 +1370,11 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
pKbd->scancodeMap = &wsAdb;
break;
#endif
+#ifdef WSKBD_TYPE_LK201
+ case WSKBD_TYPE_LK201:
+ pKbd->scancodeMap = &wsLk201;
+ break;
+#endif
#ifdef WSKBD_TYPE_SUN
#ifdef WSKBD_TYPE_SUN5
case WSKBD_TYPE_SUN5:
diff --git a/driver/xf86-input-keyboard/src/bsd_kbd.c b/driver/xf86-input-keyboard/src/bsd_kbd.c
index 24ee3d9a8..987dde503 100644
--- a/driver/xf86-input-keyboard/src/bsd_kbd.c
+++ b/driver/xf86-input-keyboard/src/bsd_kbd.c
@@ -41,6 +41,21 @@ typedef struct {
struct termios kbdtty;
} BsdKbdPrivRec, *BsdKbdPrivPtr;
+#ifdef WSCONS_SUPPORT
+static Bool
+WSSetVersion(int fd, const char *name)
+{
+#ifdef WSKBDIO_SETVERSION
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(fd, WSKBDIO_SETVERSION, &version) == -1) {
+ xf86Msg(X_WARNING, "%s: cannot set version\n", name);
+ return FALSE;
+ }
+#endif
+ return TRUE;
+}
+#endif
+
static
int KbdInit(InputInfoPtr pInfo, int what)
{
@@ -56,7 +71,7 @@ int KbdInit(InputInfoPtr pInfo, int what)
#if defined WSCONS_SUPPORT
case WSCONS:
#endif
- tcgetattr(pInfo->fd, &(priv->kbdtty));
+ tcgetattr(pInfo->fd, &(priv->kbdtty));
#endif
break;
}
@@ -175,8 +190,8 @@ KbdOn(InputInfoPtr pInfo, int what)
xf86Msg(X_ERROR, "KbdOn: tcsetattr: %s\n",
strerror(errno));
}
- break;
-#endif
+ break;
+#endif
}
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
switch (pKbd->consType) {
@@ -191,7 +206,6 @@ KbdOn(InputInfoPtr pInfo, int what)
ioctl(pInfo->fd, KDSKBMODE, K_RAW);
#endif
break;
-#endif
#ifdef WSCONS_SUPPORT
case WSCONS:
option = WSKBD_RAW;
@@ -206,6 +220,24 @@ KbdOn(InputInfoPtr pInfo, int what)
break;
#endif
}
+#endif
+ } else {
+ switch (pKbd->consType) {
+#ifdef WSCONS_SUPPORT
+ case WSCONS:
+ if ((pKbd->wsKbdDev[0] != 0) && (pInfo->fd == -1)) {
+ xf86Msg(X_INFO, "opening %s\n", pKbd->wsKbdDev);
+ pInfo->fd = open(pKbd->wsKbdDev, O_RDONLY | O_NONBLOCK | O_EXCL);
+ if (pInfo->fd == -1) {
+ xf86Msg(X_ERROR, "cannot open \"%s\"\n", pKbd->wsKbdDev);
+ return FALSE;
+ }
+ if (WSSetVersion(pInfo->fd, pInfo->name) == FALSE)
+ return FALSE;
+ }
+ break;
+#endif
+ }
}
return Success;
}
@@ -240,6 +272,19 @@ KbdOff(InputInfoPtr pInfo, int what)
break;
#endif
}
+ } else {
+ switch (pKbd->consType) {
+#ifdef WSCONS_SUPPORT
+ case WSCONS:
+ if ((pKbd->wsKbdDev[0] != 0) && (pInfo->fd != -1)) {
+ xf86Msg(X_INFO, "closing %s\n", pKbd->wsKbdDev);
+ /* need to close the fd while we're gone */
+ close(pInfo->fd);
+ pInfo->fd = -1;
+ }
+ break;
+#endif
+ }
}
return Success;
}
@@ -253,7 +298,7 @@ SoundBell(InputInfoPtr pInfo, int loudness, int pitch, int duration)
#endif
if (loudness && pitch) {
- switch (pKbd->consType) {
+ switch (pKbd->consType) {
#ifdef PCCONS_SUPPORT
case PCCONS:
{ int data[2];
@@ -323,9 +368,9 @@ WSReadInput(InputInfoPtr pInfo)
}
static void
-printWsType(char *type, char *devname)
+printWsType(const char *type, const char *name)
{
- xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", devname, type);
+ xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", name, type);
}
#endif
@@ -346,7 +391,7 @@ OpenKeyboard(InputInfoPtr pInfo)
}
switch (prot) {
- case PROT_STD:
+ case PROT_STD:
pInfo->read_input = stdReadInput;
break;
#ifdef WSCONS_SUPPORT
@@ -361,29 +406,29 @@ OpenKeyboard(InputInfoPtr pInfo)
}
free(s);
- s = xf86SetStrOption(pInfo->options, "Device", NULL);
+ if (prot == PROT_WSCONS)
+ s = xf86SetStrOption(pInfo->options, "Device", "/dev/wskbd");
+ else
+ s = xf86SetStrOption(pInfo->options, "Device", NULL);
+
if (s == NULL) {
- if (prot == PROT_WSCONS) {
- xf86Msg(X_ERROR,"A \"device\" option is required with"
- " the \"wskbd\" keyboard protocol\n");
- return FALSE;
- } else {
- pInfo->fd = xf86Info.consoleFd;
- pKbd->isConsole = TRUE;
- pKbd->consType = xf86Info.consType;
- }
+ pInfo->fd = xf86Info.consoleFd;
+ pKbd->isConsole = TRUE;
+ pKbd->consType = xf86Info.consType;
+ pKbd->wsKbdDev[0] = 0;
} else {
#ifndef X_PRIVSEP
- pInfo->fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL);
+ pInfo->fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL);
#else
- pInfo->fd = priv_open_device(s);
+ pInfo->fd = priv_open_device(s);
#endif
- if (pInfo->fd == -1) {
+ if (pInfo->fd == -1) {
xf86Msg(X_ERROR, "%s: cannot open \"%s\"\n", pInfo->name, s);
free(s);
return FALSE;
}
pKbd->isConsole = FALSE;
+ strncpy(pKbd->wsKbdDev, s, 256);
pKbd->consType = xf86Info.consType;
free(s);
}
@@ -391,6 +436,8 @@ OpenKeyboard(InputInfoPtr pInfo)
#ifdef WSCONS_SUPPORT
if (prot == PROT_WSCONS) {
pKbd->consType = WSCONS;
+ if (WSSetVersion(pInfo->fd, pInfo->name) == FALSE)
+ return FALSE;
/* Find out keyboard type */
if (ioctl(pInfo->fd, WSKBDIO_GTYPE, &(pKbd->wsKbdType)) == -1) {
xf86Msg(X_ERROR, "%s: cannot get keyboard type", pInfo->name);
@@ -404,6 +451,12 @@ OpenKeyboard(InputInfoPtr pInfo)
case WSKBD_TYPE_PC_AT:
printWsType("AT", pInfo->name);
break;
+ case 0:
+ /* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
+ xf86Msg(X_WARNING, "%s: No keyboard attached, assuming USB\n",
+ pInfo->name);
+ pKbd->wsKbdType = WSKBD_TYPE_USB;
+ /* FALLTHROUGH */
case WSKBD_TYPE_USB:
printWsType("USB", pInfo->name);
break;
@@ -412,6 +465,21 @@ OpenKeyboard(InputInfoPtr pInfo)
printWsType("ADB", pInfo->name);
break;
#endif
+#ifdef WSKBD_TYPE_LK201
+ case WSKBD_TYPE_LK201:
+ printWsType("LK201", pInfo->name);
+ break;
+#endif
+#ifdef WSKBD_TYPE_LK401
+ case WSKBD_TYPE_LK401:
+ printWsType("LK-401", pInfo->name);
+ break;
+#endif
+#ifdef WSKBD_TYPE_MAPLE
+ case WSKBD_TYPE_MAPLE:
+ printWsType("Maple", pInfo->name);
+ break;
+#endif
#ifdef WSKBD_TYPE_SUN
case WSKBD_TYPE_SUN:
printWsType("Sun", pInfo->name);
@@ -422,17 +490,11 @@ OpenKeyboard(InputInfoPtr pInfo)
printWsType("Sun5", pInfo->name);
break;
#endif
- case WSKBD_TYPE_LK201:
- printWsType("LK-201", pInfo->name);
- break;
- case WSKBD_TYPE_LK401:
- printWsType("LK-401", pInfo->name);
- break;
default:
- xf86Msg(X_ERROR, "%s: Unsupported wskbd type \"%d\"",
- pInfo->name, pKbd->wsKbdType);
- close(pInfo->fd);
- return FALSE;
+ xf86Msg(X_WARNING, "%s: Unsupported wskbd type \"%d\"\n",
+ pInfo->name, pKbd->wsKbdType);
+ printWsType("Unknown wskbd", pInfo->name);
+ break;
}
}
#endif
diff --git a/driver/xf86-input-keyboard/src/kbd.c b/driver/xf86-input-keyboard/src/kbd.c
index 083617f0b..0c6f6eb05 100644
--- a/driver/xf86-input-keyboard/src/kbd.c
+++ b/driver/xf86-input-keyboard/src/kbd.c
@@ -85,7 +85,15 @@ _X_EXPORT InputDriverRec KEYBOARD = {
};
static const char *kbdDefaults[] = {
+#ifdef __NetBSD__
+#ifdef DEFAULT_TO_WSKBD
+ "Protocol", "wskbd",
+#else
+ "Protocol", "standard",
+#endif
+#else /* NetBSD */
"Protocol", "standard",
+#endif /* NetBSD */
"XkbRules", XKB_DFLT_RULES,
"XkbModel", "pc105",
"XkbLayout", "us",
diff --git a/driver/xf86-input-keyboard/src/xf86OSKbd.h b/driver/xf86-input-keyboard/src/xf86OSKbd.h
index 0d8792d27..86df0f594 100644
--- a/driver/xf86-input-keyboard/src/xf86OSKbd.h
+++ b/driver/xf86-input-keyboard/src/xf86OSKbd.h
@@ -82,6 +82,7 @@ typedef struct {
pointer private;
int consType;
int wsKbdType;
+ char wsKbdDev[256];
} KbdDevRec, *KbdDevPtr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:05:35 +0000