diff options
| -rw-r--r-- | driver/xf86-input-keyboard/Makefile.in | 11 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/config.h.in | 6 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/configure | 304 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/man/Makefile.am | 4 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/man/Makefile.in | 15 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/man/keyboard.man | 108 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/src/Makefile.in | 191 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/src/kbd.c | 90 |
8 files changed, 365 insertions, 364 deletions
diff --git a/driver/xf86-input-keyboard/Makefile.in b/driver/xf86-input-keyboard/Makefile.in index 40b27d00f..bab141a35 100644 --- a/driver/xf86-input-keyboard/Makefile.in +++ b/driver/xf86-input-keyboard/Makefile.in @@ -104,10 +104,11 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BSD_FALSE = @BSD_FALSE@ +BSD_TRUE = @BSD_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -130,6 +131,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +HURD_FALSE = @HURD_FALSE@ +HURD_TRUE = @HURD_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -140,6 +143,8 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINUX_FALSE = @LINUX_FALSE@ +LINUX_TRUE = @LINUX_TRUE@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -158,8 +163,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SCO_FALSE = @SCO_FALSE@ +SCO_TRUE = @SCO_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOLARIS_FALSE = @SOLARIS_FALSE@ +SOLARIS_TRUE = @SOLARIS_TRUE@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ diff --git a/driver/xf86-input-keyboard/config.h.in b/driver/xf86-input-keyboard/config.h.in index 0ee57c459..2b1effb74 100644 --- a/driver/xf86-input-keyboard/config.h.in +++ b/driver/xf86-input-keyboard/config.h.in @@ -32,6 +32,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Name of the period field in struct kbd_repeat */ +#undef LNX_KBD_PERIOD_NAME + /* Name of package */ #undef PACKAGE @@ -62,8 +65,5 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Use deprecated keyboard driver */ -#undef USE_DEPRECATED_KEYBOARD_DRIVER - /* Version number of package */ #undef VERSION diff --git a/driver/xf86-input-keyboard/configure b/driver/xf86-input-keyboard/configure index e34b0869c..8da9821a8 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.59 for xf86-input-keyboard 1.1.1. +# Generated by GNU Autoconf 2.59 for xf86-input-keyboard 1.2.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-input-keyboard' PACKAGE_TARNAME='xf86-input-keyboard' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='xf86-input-keyboard 1.1.1' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='xf86-input-keyboard 1.2.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME COMPAT_DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LINUX_TRUE LINUX_FALSE BSD_TRUE BSD_FALSE SOLARIS_TRUE SOLARIS_FALSE HURD_TRUE HURD_FALSE SCO_TRUE SCO_FALSE inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -966,7 +966,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.1.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-keyboard 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-keyboard 1.1.1:";; + short | recursive ) echo "Configuration of xf86-input-keyboard 1.2.2:";; esac cat <<\_ACEOF @@ -1050,7 +1050,6 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) - --enable-depkbd Use deprecated keyboard driver [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1182,7 +1181,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-input-keyboard configure 1.1.1 +xf86-input-keyboard configure 1.2.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1196,7 +1195,7 @@ cat >&5 <<_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.1.1, which was +It was created by xf86-input-keyboard $as_me 1.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1841,7 +1840,7 @@ fi # Define the identity of the package. PACKAGE='xf86-input-keyboard' - VERSION='1.1.1' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -2000,9 +1999,6 @@ fi DRIVER_NAME=kbd -COMPAT_DRIVER_NAME=keyboard - - ac_config_headers="$ac_config_headers config.h" @@ -3732,7 +3728,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3735 "configure"' > conftest.$ac_ext + echo '#line 3731 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5331,7 +5327,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5334:" \ +echo "$as_me:5330:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6394,11 +6390,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6397: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6393: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6401: \$? = $ac_status" >&5 + echo "$as_me:6397: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6662,11 +6658,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6665: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6661: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6669: \$? = $ac_status" >&5 + echo "$as_me:6665: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6766,11 +6762,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6769: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6765: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6773: \$? = $ac_status" >&5 + echo "$as_me:6769: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9115,7 +9111,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9118 "configure" +#line 9114 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9215,7 +9211,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9218 "configure" +#line 9214 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11559,11 +11555,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11562: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11558: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11566: \$? = $ac_status" >&5 + echo "$as_me:11562: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11663,11 +11659,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11662: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11670: \$? = $ac_status" >&5 + echo "$as_me:11666: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13233,11 +13229,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13236: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13232: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13240: \$? = $ac_status" >&5 + echo "$as_me:13236: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13337,11 +13333,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13340: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13336: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13344: \$? = $ac_status" >&5 + echo "$as_me:13340: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15544,11 +15540,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15547: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15543: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15551: \$? = $ac_status" >&5 + echo "$as_me:15547: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15812,11 +15808,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15815: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15811: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15819: \$? = $ac_status" >&5 + echo "$as_me:15815: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15916,11 +15912,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15915: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15923: \$? = $ac_status" >&5 + echo "$as_me:15919: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19431,40 +19427,148 @@ fi -#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) -# -#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], -# [Build XInput support (default: yes)]), -# [XINPUT=$enableval],[XINPUT=yes]) -#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes") -#if test "x$XINPUT" = "xyes" ; then -# AC_DEFINE(XINPUT,1,[Enable XInput support]) -#fi -# -#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb], -# [Build XKB support (default: yes)]), -# [XKB=$enableval],[XKB=yes]) -#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes") -#if test "x$XKB" = "xyes" ; then -# AC_DEFINE(XKB,1,[Enable XKB support]) -#fi - -# Check whether --enable-depkbd or --disable-depkbd was given. -if test "${enable_depkbd+set}" = set; then - enableval="$enable_depkbd" - DEPKBD=$enableval -else - DEPKBD=no -fi; -if test "x$DEPKBD" = "xyes" ; then +case $host_os in + linux*) + IS_LINUX="yes" + # check whether struct kbd_repeat has the 'period' field. + # on kernels < 2.5.42 it's called 'rate' instead. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define USE_DEPRECATED_KEYBOARD_DRIVER 1 +#include <linux/kd.h> +#ifdef __sparc__ +#include <asm/param.h> +#include <asm/kbio.h> +#endif + +int +main () +{ + +int main () { + struct kbd_repeat k; + k.period = 0; + return 0; +} + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + period_field="period" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +period_field="rate" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +cat >>confdefs.h <<_ACEOF +#define LNX_KBD_PERIOD_NAME $period_field _ACEOF + ;; + + freebsd* | kfreebsd-gnu* | netbsd* | openbsd*) + IS_BSD="yes" + ;; + + solaris*) + IS_SOLARIS="yes" + ;; + + gnu*) + IS_HURD="yes" + ;; + + *) + { { echo "$as_me:$LINENO: error: Your operating system is not supported by the kbd driver. + Contact xorg@lists.freedesktop.org if you are interested in + porting it." >&5 +echo "$as_me: error: Your operating system is not supported by the kbd driver. + Contact xorg@lists.freedesktop.org if you are interested in + porting it." >&2;} + { (exit 1); exit 1; }; } + ;; +esac + + +if test "x$IS_LINUX" = xyes; then + LINUX_TRUE= + LINUX_FALSE='#' +else + LINUX_TRUE='#' + LINUX_FALSE= +fi + + + +if test "x$IS_BSD" = xyes; then + BSD_TRUE= + BSD_FALSE='#' +else + BSD_TRUE='#' + BSD_FALSE= +fi + + + +if test "x$IS_SOLARIS" = xyes; then + SOLARIS_TRUE= + SOLARIS_FALSE='#' +else + SOLARIS_TRUE='#' + SOLARIS_FALSE= +fi + + + +if test "x$IS_HURD" = xyes; then + HURD_TRUE= + HURD_FALSE='#' +else + HURD_TRUE='#' + HURD_FALSE= +fi + + + +if test "x$IS_SCO" = xyes; then + SCO_TRUE= + SCO_FALSE='#' +else + SCO_TRUE='#' + SCO_FALSE= fi + # Check whether --with-xorg-module-dir or --without-xorg-module-dir was given. if test "${with_xorg_module_dir+set}" = set; then withval="$with_xorg_module_dir" @@ -19779,12 +19883,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2.99.0 xproto \$REQUIRED_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES" 2>/dev/null` + pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -19797,12 +19901,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_XORG_LIBS="$XORG_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2.99.0 xproto \$REQUIRED_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES" 2>/dev/null` + pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -19821,14 +19925,14 @@ 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.0.99.901 xproto $REQUIRED_MODULES"` + XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES"` else - XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES"` + XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES"` fi # Put the nasty error message in config.log where it belongs echo "$XORG_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES) were not met: $XORG_PKG_ERRORS @@ -19839,7 +19943,7 @@ 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. " >&5 -echo "$as_me: error: Package requirements (xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES) were not met: +echo "$as_me: error: Package requirements (xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES) were not met: $XORG_PKG_ERRORS @@ -20293,6 +20397,41 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BSD\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"SOLARIS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HURD_TRUE}" && test -z "${HURD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HURD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HURD\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${SCO_TRUE}" && test -z "${SCO_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"SCO\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"SCO\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -20564,7 +20703,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-input-keyboard $as_me 1.1.1, which was +This file was extended by xf86-input-keyboard $as_me 1.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20627,7 +20766,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-input-keyboard config.status 1.1.1 +xf86-input-keyboard config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -20853,7 +20992,6 @@ s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t s,@DRIVER_NAME@,$DRIVER_NAME,;t t -s,@COMPAT_DRIVER_NAME@,$COMPAT_DRIVER_NAME,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t @@ -20897,6 +21035,16 @@ s,@F77@,$F77,;t t s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@LINUX_TRUE@,$LINUX_TRUE,;t t +s,@LINUX_FALSE@,$LINUX_FALSE,;t t +s,@BSD_TRUE@,$BSD_TRUE,;t t +s,@BSD_FALSE@,$BSD_FALSE,;t t +s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t +s,@SOLARIS_FALSE@,$SOLARIS_FALSE,;t t +s,@HURD_TRUE@,$HURD_TRUE,;t t +s,@HURD_FALSE@,$HURD_FALSE,;t t +s,@SCO_TRUE@,$SCO_TRUE,;t t +s,@SCO_FALSE@,$SCO_FALSE,;t t s,@inputdir@,$inputdir,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t diff --git a/driver/xf86-input-keyboard/man/Makefile.am b/driver/xf86-input-keyboard/man/Makefile.am index 37abc069b..f0eb29b85 100644 --- a/driver/xf86-input-keyboard/man/Makefile.am +++ b/driver/xf86-input-keyboard/man/Makefile.am @@ -26,11 +26,11 @@ drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man +driverman_PRE = @DRIVER_NAME@.man driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man +EXTRA_DIST = @DRIVER_NAME@.man CLEANFILES = $(driverman_DATA) diff --git a/driver/xf86-input-keyboard/man/Makefile.in b/driver/xf86-input-keyboard/man/Makefile.in index 9baf101cc..3915abb57 100644 --- a/driver/xf86-input-keyboard/man/Makefile.in +++ b/driver/xf86-input-keyboard/man/Makefile.in @@ -96,10 +96,11 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BSD_FALSE = @BSD_FALSE@ +BSD_TRUE = @BSD_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -122,6 +123,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +HURD_FALSE = @HURD_FALSE@ +HURD_TRUE = @HURD_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -132,6 +135,8 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINUX_FALSE = @LINUX_FALSE@ +LINUX_TRUE = @LINUX_TRUE@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -150,8 +155,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SCO_FALSE = @SCO_FALSE@ +SCO_TRUE = @SCO_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOLARIS_FALSE = @SOLARIS_FALSE@ +SOLARIS_TRUE = @SOLARIS_TRUE@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ @@ -202,9 +211,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man +driverman_PRE = @DRIVER_NAME@.man driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man +EXTRA_DIST = @DRIVER_NAME@.man CLEANFILES = $(driverman_DATA) SED = sed diff --git a/driver/xf86-input-keyboard/man/keyboard.man b/driver/xf86-input-keyboard/man/keyboard.man deleted file mode 100644 index 4c0154fad..000000000 --- a/driver/xf86-input-keyboard/man/keyboard.man +++ /dev/null @@ -1,108 +0,0 @@ -.\" $XdotOrg: $ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ -.\" shorthand for double quote that works everywhere. -.ds q \N'34' -.TH KEYBOARD __drivermansuffix__ __vendorversion__ -.SH NAME -keyboard \- Keyboard input driver -.SH SYNOPSIS -.nf -.B "Section \*qInputDevice\*q" -.BI " Identifier \*q" idevname \*q -.B " Driver \*qkeyboard\*q" -\ \ ... -.B EndSection -.fi -.SH DESCRIPTION -.B keyboard -is an __xservername__ input driver for keyboards. The driver supports the standard -OS-provided keyboard interface. -.PP -The -.B keyboard -driver functions as a keyboard input device, and may be used as the -X server's core keyboard. -.PP -This driver is built-in to the core X server, and multiple instances are not -supported. A loadable driver, -.BR kbd , -is available, and is planned to replace the -.B keyboard -driver in a future release of the __xservername__ server. -.SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration -details and for options that can be used with all input drivers. This -section only covers configuration details specific to this driver. -.PP -The following driver -.B Options -are supported: -.TP 7 -.BI "Option \*qProtocol\*q \*q" string \*q -Specify the keyboard protocol. Valid protocol types include: -.PP -.RS 12 -Standard, Xqueue. -.RE -.PP -.RS 7 -Not all protocols are supported on all platforms. Default: "Standard". -.RE -.TP 7 -.BI "Option \*qAutoRepeat\*q \*q" "delay rate" \*q -sets the auto repeat behaviour for the keyboard. This is not implemented -on all platforms. -.I delay -is the time in milliseconds before a key starts repeating. -.I rate -is the number of times a key repeats per second. Default: "500 30". -.TP 7 -.BI "Option \*qXLeds\*q \*q" ledlist \*q -makes the keyboard LEDs specified in -.I ledlist -available for client use instead of their traditional function -(Scroll Lock, Caps Lock and Num Lock). The numbers in the list are -in the range 1 to 3. Default: empty list. -.TP 7 -.BI "Option \*qXkbDisable\*q \*q" boolean \*q -disable/enable the XKEYBOARD extension. The \-kb command line -option overrides this config file option. Default: XKB is enabled. -.PP -.RS 7 -NOTE: This option should be specified in the -.B ServerFlags -section rather than here. It's use here is deprecated. -.RE -.TP 7 -.BI "Option \*qXkbRules\*q \*q" rules \*q -specifies which XKB rules file to use for interpreting the -.BR XkbModel , -.BR XkbLayout , -.BR XkbVariant , -and -.B XkbOptions -settings. Default: "xorg" for most platforms, but "xfree98" for the -Japanese PC-98 platforms. -.TP 7 -.BI "Option \*qXkbModel\*q \*q" modelname \*q -specifies the XKB keyboard model name. Default: "pc105" for most platforms, -but "pc98" for the Japanese PC-98 platforms. -.TP 7 -.BI "Option \*qXkbLayout\*q \*q" layoutname \*q -specifies the XKB keyboard layout name. This is usually the country or -language type of the keyboard. Default: "us" for most platforms, but -"nec/jp" for the Japanese PC-98 platforms. -.TP 7 -.BI "Option \*qXkbVariant\*q \*q" variants \*q -specifies the XKB keyboard variant components. These can be used to -enhance the keyboard layout details. Default: not set. -.TP 7 -.BI "Option \*qXkbOptions\*q \*q" options \*q -specifies the XKB keyboard option components. These can be used to -enhance the keyboard behaviour. Default: not set. -.PP -Some other XKB-related options are available, but they are incompatible -with the ones listed above and are not recommended, so they are not -documented here. -.SH "SEE ALSO" -kbd(__drivermansuffix__), __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). diff --git a/driver/xf86-input-keyboard/src/Makefile.in b/driver/xf86-input-keyboard/src/Makefile.in index 10184616a..98ae27e40 100644 --- a/driver/xf86-input-keyboard/src/Makefile.in +++ b/driver/xf86-input-keyboard/src/Makefile.in @@ -56,6 +56,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BSD_TRUE@am__append_1 = $(BSD_SRCS) +@SOLARIS_TRUE@am__append_2 = $(SOLARIS_SRCS) +@LINUX_TRUE@am__append_3 = $(LINUX_SRCS) +@SCO_TRUE@am__append_4 = $(SCO_SRCS) +@HURD_TRUE@am__append_5 = $(HURD_SRCS) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -71,19 +76,27 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)" \ - "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" -@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL) -@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES) \ - $(@DRIVER_NAME@_drv_la_LTLIBRARIES) -@COMPAT_DRIVER_NAME@_drv_la_LIBADD = -am_@COMPAT_DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo -@COMPAT_DRIVER_NAME@_drv_la_OBJECTS = \ - $(am_@COMPAT_DRIVER_NAME@_drv_la_OBJECTS) -@DRIVER_NAME@_drv_la_LIBADD = -am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo -@DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS) +am__installdirs = "$(DESTDIR)$(driverdir)" +driverLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(driver_LTLIBRARIES) +kbd_drv_la_LIBADD = +am__kbd_drv_la_SOURCES_DIST = kbd.c xf86OSKbd.h xf86Keymap.h \ + bsd_KbdMap.c bsd_kbd.c bsd_kbd.h at_scancode.c sun_kbd.c \ + sun_kbd.h sun_kbdMap.c lnx_KbdMap.c lnx_kbd.c lnx_kbd.h \ + sco_KbdMap.c sco_kbd.c sco_kbd.h hurd_kbd.c +am__objects_1 = bsd_KbdMap.lo bsd_kbd.lo at_scancode.lo +@BSD_TRUE@am__objects_2 = $(am__objects_1) +am__objects_3 = sun_kbd.lo sun_kbdMap.lo +@SOLARIS_TRUE@am__objects_4 = $(am__objects_3) +am__objects_5 = lnx_KbdMap.lo lnx_kbd.lo at_scancode.lo +@LINUX_TRUE@am__objects_6 = $(am__objects_5) +am__objects_7 = sco_KbdMap.lo sco_kbd.lo +@SCO_TRUE@am__objects_8 = $(am__objects_7) +am__objects_9 = hurd_kbd.lo at_scancode.lo +@HURD_TRUE@am__objects_10 = $(am__objects_9) +am_kbd_drv_la_OBJECTS = kbd.lo $(am__objects_2) $(am__objects_4) \ + $(am__objects_6) $(am__objects_8) $(am__objects_10) +kbd_drv_la_OBJECTS = $(am_kbd_drv_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,10 +108,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(@COMPAT_DRIVER_NAME@_drv_la_SOURCES) \ - $(@DRIVER_NAME@_drv_la_SOURCES) -DIST_SOURCES = $(@COMPAT_DRIVER_NAME@_drv_la_SOURCES) \ - $(@DRIVER_NAME@_drv_la_SOURCES) +SOURCES = $(kbd_drv_la_SOURCES) +DIST_SOURCES = $(am__kbd_drv_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -115,10 +126,11 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BSD_FALSE = @BSD_FALSE@ +BSD_TRUE = @BSD_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -141,6 +153,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +HURD_FALSE = @HURD_FALSE@ +HURD_TRUE = @HURD_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -151,6 +165,8 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINUX_FALSE = @LINUX_FALSE@ +LINUX_TRUE = @LINUX_TRUE@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -169,8 +185,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SCO_FALSE = @SCO_FALSE@ +SCO_TRUE = @SCO_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOLARIS_FALSE = @SOLARIS_FALSE@ +SOLARIS_TRUE = @SOLARIS_TRUE@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ @@ -220,20 +240,18 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la -@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_ladir = @inputdir@ -@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c -@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES = @COMPAT_DRIVER_NAME@_drv.la -@COMPAT_DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@COMPAT_DRIVER_NAME@_drv_ladir = @inputdir@ -@COMPAT_DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c +driverdir = @inputdir@ +driver_LTLIBRARIES = kbd_drv.la +kbd_drv_la_LDFLAGS = -avoid-version -module +kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h $(am__append_1) \ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) +BSD_SRCS = bsd_KbdMap.c bsd_kbd.c bsd_kbd.h at_scancode.c +HURD_SRCS = hurd_kbd.c at_scancode.c +LINUX_SRCS = lnx_KbdMap.c lnx_kbd.c lnx_kbd.h at_scancode.c +SCO_SRCS = sco_KbdMap.c sco_kbd.c sco_kbd.h +SOLARIS_SRCS = sun_kbd.c sun_kbd.h sun_kbdMap.c +EXTRA_DIST = $(BSD_SRCS) $(HURD_SRCS) $(LINUX_SRCS) $(SCO_SRCS) $(SOLARIS_SRCS) all: all-am .SUFFIXES: @@ -267,64 +285,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES: $(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(@COMPAT_DRIVER_NAME@_drv_ladir)" || $(mkdir_p) "$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)" - @list='$(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)/$$f'"; \ - $(LIBTOOL) --mode=install $(@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)/$$f"; \ - else :; fi; \ - done - -uninstall-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)/$$p"; \ - done - -clean-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES: - -test -z "$(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES)" || rm -f $(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES) - @list='$(@COMPAT_DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-@DRIVER_NAME@_drv_laLTLIBRARIES: $(@DRIVER_NAME@_drv_la_LTLIBRARIES) +install-driverLTLIBRARIES: $(driver_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(@DRIVER_NAME@_drv_ladir)" || $(mkdir_p) "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" - @list='$(@DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ + test -z "$(driverdir)" || $(mkdir_p) "$(DESTDIR)$(driverdir)" + @list='$(driver_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)/$$f'"; \ - $(LIBTOOL) --mode=install $(@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(driverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(driverdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(driverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(driverdir)/$$f"; \ else :; fi; \ done -uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES: +uninstall-driverLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(@DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ + @set -x; list='$(driver_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(driverdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(driverdir)/$$p"; \ done -clean-@DRIVER_NAME@_drv_laLTLIBRARIES: - -test -z "$(@DRIVER_NAME@_drv_la_LTLIBRARIES)" || rm -f $(@DRIVER_NAME@_drv_la_LTLIBRARIES) - @list='$(@DRIVER_NAME@_drv_la_LTLIBRARIES)'; for p in $$list; do \ +clean-driverLTLIBRARIES: + -test -z "$(driver_LTLIBRARIES)" || rm -f $(driver_LTLIBRARIES) + @list='$(driver_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@COMPAT_DRIVER_NAME@_drv.la: $(@COMPAT_DRIVER_NAME@_drv_la_OBJECTS) $(@COMPAT_DRIVER_NAME@_drv_la_DEPENDENCIES) - $(LINK) -rpath $(@COMPAT_DRIVER_NAME@_drv_ladir) $(@COMPAT_DRIVER_NAME@_drv_la_LDFLAGS) $(@COMPAT_DRIVER_NAME@_drv_la_OBJECTS) $(@COMPAT_DRIVER_NAME@_drv_la_LIBADD) $(LIBS) -@DRIVER_NAME@_drv.la: $(@DRIVER_NAME@_drv_la_OBJECTS) $(@DRIVER_NAME@_drv_la_DEPENDENCIES) - $(LINK) -rpath $(@DRIVER_NAME@_drv_ladir) $(@DRIVER_NAME@_drv_la_LDFLAGS) $(@DRIVER_NAME@_drv_la_OBJECTS) $(@DRIVER_NAME@_drv_la_LIBADD) $(LIBS) +kbd_drv.la: $(kbd_drv_la_OBJECTS) $(kbd_drv_la_DEPENDENCIES) + $(LINK) -rpath $(driverdir) $(kbd_drv_la_LDFLAGS) $(kbd_drv_la_OBJECTS) $(kbd_drv_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -332,7 +321,17 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/@DRIVER_NAME@.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at_scancode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_KbdMap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_KbdMap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sco_KbdMap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sco_kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sun_kbd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sun_kbdMap.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -444,7 +443,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(@COMPAT_DRIVER_NAME@_drv_ladir)" "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"; do \ + for dir in "$(DESTDIR)$(driverdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -473,9 +472,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-generic \ - clean-libtool mostlyclean-am +clean-am: clean-driverLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -493,8 +491,7 @@ info: info-am info-am: -install-data-am: install-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - install-@DRIVER_NAME@_drv_laLTLIBRARIES +install-data-am: install-driverLTLIBRARIES install-exec-am: @@ -522,26 +519,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES uninstall-info-am +uninstall-am: uninstall-driverLTLIBRARIES uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-generic \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install \ - install-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - install-@DRIVER_NAME@_drv_laLTLIBRARIES install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall \ - uninstall-@COMPAT_DRIVER_NAME@_drv_laLTLIBRARIES \ - uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES uninstall-am \ - uninstall-info-am + clean-driverLTLIBRARIES clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-driverLTLIBRARIES install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-driverLTLIBRARIES uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/driver/xf86-input-keyboard/src/kbd.c b/driver/xf86-input-keyboard/src/kbd.c index b463eea9f..668da4eca 100644 --- a/driver/xf86-input-keyboard/src/kbd.c +++ b/driver/xf86-input-keyboard/src/kbd.c @@ -114,7 +114,6 @@ typedef enum { OPTION_CUSTOM_KEYCODES } KeyboardOpts; -#ifdef XFree86LOADER /* These aren't actually used ... */ static const OptionInfoRec KeyboardOptions[] = { { OPTION_ALWAYS_CORE, "AlwaysCore", OPTV_BOOLEAN, {0}, FALSE }, @@ -140,7 +139,6 @@ static const OptionInfoRec KeyboardOptions[] = { { OPTION_CUSTOM_KEYCODES, "CustomKeycodes", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; -#endif static const char *kbdDefaults[] = { #ifdef XQUEUE @@ -188,14 +186,12 @@ static char *xkb_options; static XkbComponentNamesRec xkbnames; #endif /* XKB */ -#ifdef XFree86LOADER /*ARGSUSED*/ static const OptionInfoRec * KeyboardAvailableOptions(void *unused) { return (KeyboardOptions); } -#endif static void SetXkbOption(InputInfoPtr pInfo, char *name, char **option) @@ -234,8 +230,6 @@ KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags) * an OS specific readInput() function to handle this. */ pInfo->read_input = NULL; - pInfo->motion_history_proc = NULL; - pInfo->history_size = 0; pInfo->control_proc = NULL; pInfo->close_proc = NULL; pInfo->switch_mode = NULL; @@ -389,7 +383,22 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl) InputInfoPtr pInfo = (InputInfoPtr) device->public.devicePrivate; KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; - if ( ctrl->leds & XCOMP ) { + if ( ctrl->leds & XLED1) { + pKbd->keyLeds |= CAPSFLAG; + } else { + pKbd->keyLeds &= ~CAPSFLAG; + } + if ( ctrl->leds & XLED2) { + pKbd->keyLeds |= NUMFLAG; + } else { + pKbd->keyLeds &= ~NUMFLAG; + } + if ( ctrl->leds & XLED3) { + pKbd->keyLeds |= SCROLLFLAG; + } else { + pKbd->keyLeds &= ~SCROLLFLAG; + } + if ( ctrl->leds & (XCOMP|XLED4) ) { pKbd->keyLeds |= COMPOSEFLAG; } else { pKbd->keyLeds &= ~COMPOSEFLAG; @@ -425,6 +434,8 @@ InitKBD(InputInfoPtr pInfo, Bool init) kevent.u.keyButtonPointer.rootX = 0; kevent.u.keyButtonPointer.rootY = 0; +/* The server does this for us with i-h. */ +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1 /* * Hmm... here is the biggest hack of every time ! * It may be possible that a switch-vt procedure has finished BEFORE @@ -454,6 +465,8 @@ InitKBD(InputInfoPtr pInfo, Bool init) (* pKeyboard->public.processInputProc)(&kevent, pKeyboard, 1); } } +#endif + pKbd->scanPrefix = 0; if (init) { @@ -797,7 +810,6 @@ sunKeyboards: } } -#ifdef XFree86LOADER ModuleInfoRec KbdInfo = { 1, "KBD", @@ -839,7 +851,7 @@ static XF86ModuleVersionInfo xf86KbdVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -852,63 +864,3 @@ _X_EXPORT XF86ModuleData kbdModuleData = { xf86KbdPlug, xf86KbdUnplug }; - - -/* Compatibility section: we have a set of module structures here that - * allows us to load this module as the old keyboard driver. */ - -#ifndef USE_DEPRECATED_KEYBOARD_DRIVER - -ModuleInfoRec KeyboardInfo = { - 1, - "KEYBOARD", - NULL, - 0, - KeyboardAvailableOptions, -}; - -static pointer -xf86KeyboardPlug(pointer module, - pointer options, - int *errmaj, - int *errmin) -{ - static Bool Initialised = FALSE; - - if (!Initialised) { - Initialised = TRUE; -#ifndef REMOVE_LOADER_CHECK_MODULE_INFO - if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) -#endif - xf86AddModuleInfo(&KeyboardInfo, module); - } - - xf86AddInputDriver(&KEYBOARD, module, 0); - - return module; -} - -static XF86ModuleVersionInfo xf86KeyboardVersionRec = -{ - "keyboard", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_XINPUT, - ABI_XINPUT_VERSION, - MOD_CLASS_XINPUT, - {0, 0, 0, 0} /* signature, to be patched into the file by */ - /* a tool */ -}; - -_X_EXPORT XF86ModuleData keyboardModuleData = { - &xf86KeyboardVersionRec, - xf86KeyboardPlug, - xf86KbdUnplug -}; - -#endif /* ! USE_DEPRECATED_KEYBOARD_DRIVER */ - -#endif /* XFree86LOADER */ |