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

Update to xf86-input-mouse 1.7.2.

Browse Source 
ok matthieu@
This commit is contained in:
shadchin 2012-04-01 12:17:17 +00:00
parent 2fd07ba0fc
commit 2949da6f87
13 changed files with 27618 additions and 20245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
driver/xf86-input-mouse/ChangeLog
View File

@ -1,3 +1,105 @@
commit 80d724d13a8de585722967f7d18a65b4b555badd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 15 23:34:21 2012 -0700
xf86-input-mouse 1.7.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 68a1e2f74dd58c913e5d1f8d6138cd8ce73232a4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 22 20:55:45 2011 -0800
sun_mouse.c: remove unused variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a5126694b29bdf9c852254b53174fcf37537b121
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 22 20:54:14 2011 -0800
Mark symtab_t.name in pnp.c as const to fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8bc8502c698115c3f4885ba42e60ede0e681caaa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 30 19:29:01 2011 -0800
Avoid NULL pointer dereference in autoProbeMouse if proto == PROT_UNSUP
Error: Null pointer dereference (CWE 476)
Read from null pointer 'GetProtocol(proto)'
at line 3477 of src/mouse.c in function 'autoProbeMouse'.
Function 'GetProtocol' may return constant 'NULL' at line 736, called at line 3477.
Null pointer introduced at line 736 in function 'GetProtocol'.
We already handle one of the two cases that make GetProtocol return NULL,
proto == PROTO_UNKNOWN, but not PROT_UNSUP.
[ This bug was found by the Parfait 0.4.2 bug checking tool.
For more information see http://labs.oracle.com/projects/parfait/ ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com>
commit b65651974ee5620086b484086ea12d78c92fa369
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Fri Aug 19 21:07:13 2011 +0600
Fix wrong read Protocol and Device from xorg.conf
Add call xf86CollectInputOptions() before using pInfo->options.
The bug is seeing by ABI < 12.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7bb5cbecbcc24f20467546f957fb95c9190514c0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 25 21:11:50 2011 -0700
sun_mouse.c: Ensure vuidMouse setup routines are called for protocol "Auto"
Fixes regression caused by commit b12fa0d5ab23 in which devices with
protocol "Auto" (generally just PS/2 devices on Solaris, since HAL
sets protocol "VUID" for USB devices already) weren't going through
vuidMousePreInit and setting up the device_control & read_input pointers
to the routines which know how to decode VUID packets.
Adds a check to vuidPreInit to ensure we don't leak memory if called
twice for the same device, just in case I missed a code path, or a
new one appears in the future.
Fixes Solaris bug 7070321: Mouse protocol "Auto" does not work in build 170
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94fb2250b12fbaf840352b83dd9f832319c92b0f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 25 20:40:03 2011 -0700
No need to merge NULL options list with existing options
Appending NULL to an existing options list simply walks the entire
existing list before returning it unchanged, so if we aren't creating
a new list to merge, don't bother merging it either.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 93ebeecdda61cc7121b5c095ed5db07ad0ca0f88
Author: Terry Lambert <tlambert@chromium.org>
Date: Fri Jul 15 17:23:23 2011 -0700
xf86-input-mouse: Return proper default for unknown values in pInfo->device_control.
Signed-off-by: Terry Lambert <tlambert@chromium.org>
Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f969bd4d1995aa802bef1cfe93afedc412bbd8a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jul 5 09:09:26 2011 -0700

24
driver/xf86-input-mouse/Makefile.in
View File

@ -105,6 +105,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -112,25 +113,21 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -139,6 +136,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -149,18 +147,24 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_MOUSE_NAME = @OS_MOUSE_NAME@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -179,13 +183,11 @@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

10297
driver/xf86-input-mouse/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

4
driver/xf86-input-mouse/config.h.in
View File

@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE

27218
driver/xf86-input-mouse/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
driver/xf86-input-mouse/configure.ac
View File

@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
[1.7.1],
[1.7.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])

10134
driver/xf86-input-mouse/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

24
driver/xf86-input-mouse/man/Makefile.in
View File

@ -94,6 +94,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -101,25 +102,21 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -128,6 +125,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -138,18 +136,24 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_MOUSE_NAME = @OS_MOUSE_NAME@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -168,13 +172,11 @@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

24
driver/xf86-input-mouse/src/Makefile.in
View File

@ -108,6 +108,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -115,25 +116,21 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -142,6 +139,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -152,18 +150,24 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_MOUSE_NAME = @OS_MOUSE_NAME@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -182,13 +186,11 @@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

3
driver/xf86-input-mouse/src/bsd_mouse.c
View File

@ -567,6 +567,9 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
pPointer->public.on = FALSE;
usleep(300000);
break;
default:
return BadValue;
}
return Success;
}

15
driver/xf86-input-mouse/src/mouse.c
View File

@ -1693,6 +1693,9 @@ MouseProc(DeviceIntPtr device, int what)
free(pMse->mousePriv);
pMse->mousePriv = NULL;
break;
default:
return BadValue;
}
return Success;
}
@ -2430,13 +2433,13 @@ SetupMouse(InputInfoPtr pInfo)
* for the new protocol.
*/
if (pMse->oldProtocolID != pMse->protocolID) {
pointer tmp = NULL;
if ((pMse->protocolID >= 0)
&& (pMse->protocolID < PROT_NUMPROTOS)
&& mouseProtocols[pMse->protocolID].defaults)
tmp = xf86OptionListCreate(
&& mouseProtocols[pMse->protocolID].defaults) {
pointer tmp = xf86OptionListCreate(
mouseProtocols[pMse->protocolID].defaults, -1, 0);
pInfo->options = xf86OptionListMerge(pInfo->options, tmp);
pInfo->options = xf86OptionListMerge(pInfo->options, tmp);
}
/*
* If baudrate is set write it back to the option
* list so that the serial interface code can access
@ -3466,12 +3469,14 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
case AUTOPROBE_SWITCH_PROTOCOL:
{
MouseProtocolID proto;
MouseProtocolPtr pProto;
void *defaults;
AP_DBG(("State SWITCH_PROTOCOL\n"));
proto = mPriv->protoList[mPriv->protocolID++];
if (proto == PROT_UNKNOWN)
mPriv->autoState = AUTOPROBE_SWITCHSERIAL;
else if (!(defaults = GetProtocol(proto)->defaults)
else if (!((pProto = GetProtocol(proto)) &&
((defaults = pProto->defaults)))
|| (mPriv->serialDefaultsNum == -1
&& (defaults == msDefaults))
|| (mPriv->serialDefaultsNum != -1

2
driver/xf86-input-mouse/src/pnp.c
View File

@ -61,7 +61,7 @@ typedef struct {
/* symbol table entry */
typedef struct {
char *name;
const char *name;
MouseProtocolID val;
} symtab_t;

10
driver/xf86-input-mouse/src/sun_mouse.c
View File

@ -203,7 +203,10 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
{
MouseDevPtr pMse = pInfo->private;
VuidMsePtr pVuidMse;
int buttons, i;
/* Ensure we don't add the same device twice */
if (getVuidMsePriv(pInfo) != NULL)
return TRUE;
pVuidMse = calloc(sizeof(VuidMseRec), 1);
if (pVuidMse == NULL) {
@ -275,7 +278,6 @@ vuidReadInput(InputInfoPtr pInfo)
int buttons;
int dx = 0, dy = 0, dz = 0, dw = 0;
unsigned int n;
int c;
unsigned char *pBuf;
int absX = 0, absY = 0;
Bool absXset = FALSE, absYset = FALSE;
@ -684,7 +686,9 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara)
} else if (pMse->protocolID == PROT_AUTO) {
pdev = xf86CheckStrOption(pInfo->options,
"Device", NULL);
solarisMouseAutoProbe(pInfo, &pproto, &pdev);
if ((solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) &&
(pproto != NULL))
sunMousePreInit(pInfo, pproto, 0);
}
return pproto;
}