qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-input-vmmouse 12.9.0

Browse Source
This commit is contained in:
matthieu 2012-06-09 09:33:55 +00:00
parent 46c42c3119
commit 0a37eba7ec
6 changed files with 88 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
driver/xf86-input-vmmouse/ChangeLog
View File

@ -1,3 +1,52 @@
commit 3a828d876772d05577b9372e8f6dc068794f4704
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue May 22 20:14:25 2012 +0200
vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
commit 2a321a39350aa020a8103813bed61ff559088195
Author: Zack Rusin <zackr@vmware.com>
Date: Thu May 10 19:55:01 2012 -0400
Revert "Adjust the kernel name in the udev file."
This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
commit 55efac85ca9bd2041240ca29316ca716ddc2185d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue May 1 16:20:59 2012 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Zack Rusin <zackr@vmware.com>
commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
Author: Michal Srb <msrb@suse.com>
Date: Thu May 3 17:55:24 2012 +0200
Enable hardware access during vmmouse preinit.
Vmmouse driver uses outl calls but never requests hardware access.
In case there are no other drivers that requests it, vmmouse
initialization will fail. (Found on KVM virtual machine with fbdev
graphics driver and vmmouse input driver.)
Request hardware access in same way xf86-input-keyboard does.
Signed-off-by: Zack Rusin <zackr@vmware.com>
commit e925b2e6e9d548db5a6646a76d513fb6881f69b4 commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
Author: Zack Rusin <zackr@vmware.com> Author: Zack Rusin <zackr@vmware.com>
Date: Thu Mar 8 09:51:48 2012 -0500 Date: Thu Mar 8 09:51:48 2012 -0500

12
driver/xf86-input-vmmouse/aclocal.m4 vendored
View File

@ -9085,18 +9085,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*- # Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

28
driver/xf86-input-vmmouse/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62 for xf86-input-vmmouse 12.8.0. # Generated by GNU Autoconf 2.62 for xf86-input-vmmouse 12.9.0.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
# #
@ -616,8 +616,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='xf86-input-vmmouse' PACKAGE_NAME='xf86-input-vmmouse'
PACKAGE_TARNAME='xf86-input-vmmouse' PACKAGE_TARNAME='xf86-input-vmmouse'
PACKAGE_VERSION='12.8.0' PACKAGE_VERSION='12.9.0'
PACKAGE_STRING='xf86-input-vmmouse 12.8.0' PACKAGE_STRING='xf86-input-vmmouse 12.9.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am" ac_unique_file="Makefile.am"
@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures xf86-input-vmmouse 12.8.0 to adapt to many kinds of systems. \`configure' configures xf86-input-vmmouse 12.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1456,7 +1456,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of xf86-input-vmmouse 12.8.0:";; short | recursive ) echo "Configuration of xf86-input-vmmouse 12.9.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1585,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
xf86-input-vmmouse configure 12.8.0 xf86-input-vmmouse configure 12.9.0
generated by GNU Autoconf 2.62 generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by xf86-input-vmmouse $as_me 12.8.0, which was It was created by xf86-input-vmmouse $as_me 12.9.0, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@ $ $0 $@
@ -1998,6 +1998,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
ac_config_headers="$ac_config_headers config.h"
am__api_version="1.9" am__api_version="1.9"
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # so one script is as good as another. But avoid the broken or
@ -2250,7 +2253,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='xf86-input-vmmouse' PACKAGE='xf86-input-vmmouse'
VERSION='12.8.0' VERSION='12.9.0'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -14497,9 +14500,6 @@ AM_DEFAULT_VERBOSITY=1
DRIVER_NAME=vmmouse DRIVER_NAME=vmmouse
ac_config_headers="$ac_config_headers config.h"
# Checks for programs. # Checks for programs.
# Check whether --enable-static was given. # Check whether --enable-static was given.
if test "${enable_static+set}" = set; then if test "${enable_static+set}" = set; then
@ -24077,7 +24077,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by xf86-input-vmmouse $as_me 12.8.0, which was This file was extended by xf86-input-vmmouse $as_me 12.9.0, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -24130,7 +24130,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
xf86-input-vmmouse config.status 12.8.0 xf86-input-vmmouse config.status 12.9.0
configured by $0, generated by GNU Autoconf 2.62, configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -24529,8 +24529,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets for ac_config_target in $ac_config_targets
do do
case $ac_config_target in case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;; "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;

6
driver/xf86-input-vmmouse/configure.ac
View File

@ -22,12 +22,14 @@
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse], AC_INIT([xf86-input-vmmouse],
[12.8.0], [12.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse) xf86-input-vmmouse)
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.) AC_CONFIG_AUX_DIR(.)
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -41,8 +43,6 @@ XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME]) AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
# Checks for programs. # Checks for programs.
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL

21
driver/xf86-input-vmmouse/src/vmmouse.c
View File

@ -65,6 +65,7 @@
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86OSmouse.h" #include "xf86OSmouse.h"
#include "xf86Priv.h"
#include "compiler.h" #include "compiler.h"
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@ -338,6 +339,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
} }
#endif #endif
/*
* enable hardware access
*/
if (!xorgHWAccess) {
if (xf86EnableIO())
xorgHWAccess = TRUE;
else
return NULL;
}
/* /*
* try to enable vmmouse here * try to enable vmmouse here
*/ */
@ -399,6 +410,16 @@ VMMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
VMMousePrivPtr mPriv = NULL; VMMousePrivPtr mPriv = NULL;
int rc = Success; int rc = Success;
/* Enable hardware access. */
if (!xorgHWAccess) {
if (xf86EnableIO())
xorgHWAccess = TRUE;
else {
rc = BadValue;
goto error;
}
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
/* For ABI < 12, we need to return the wrapped driver's pInfo (see /* For ABI < 12, we need to return the wrapped driver's pInfo (see
* above). ABI 12, we call NIDR and are done */ * above). ABI 12, we call NIDR and are done */

2
driver/xf86-input-vmmouse/tools/69-xorg-vmmouse.rules.in
View File

@ -1 +1 @@
ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="mouse[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"