b8ee7a5d5e
From xorg-announce@ mail: The big change in 1.4.0 is the move of the OS-specific mouse handling code from the Xorg server to the mouse driver. This code was removed from the Xorg server in the Xorg 1.6 development cycle, so users of non-evdev systems (i.e. non-Linux or pre-evdev Linux) will need this version of the mouse driver to run with Xorg 1.6. Remove useless call to xf86AddModuleInfo Merge some hardware support information from README.mouse into man page Fix sun_mouse.c build on Solaris Rename OS_SOURCES to stop automake complaints about not building program "OS" Remove checks for Solaris x86 versions older than Solaris 8 sun_mouse.c: remove unused variables sun_mouse.c: Use miPointerGetScreen instead of miPointerCurrentScreen Fix solarisMouseAutoProbe to use device name & protocol specified by HAL sun_mouse: check for Device in commonOptions if pInfo->options isn't set yet Replace static changelog with one generated via XORG_CHANGELOG Add XORG_CWARNFLAGS & XORG_WITH_LINT for more compiler checking Clear assorted compiler, sparse & lint warnings sun_mouse: fallback to commonOptions for StreamsModule too Comment typo fixes Remove some #if 1 statements Unifdef XFree86LOADER Add copyright notices for OS mouse code to COPYING file Add note on hal-based configuration to man page Version 1.4.0 Add OS mouse sources to the driver build Change screen private key to an integer variable. Build fix: Add a prototype for FindDevice function. Include xorg-server.h to get the WSCONS_SUPPORT define from prevent a double free of mouse private structure. W axis support for bsd_mouse. Make sure xf86MouseProtocolIDToName is of public visibility. Compile warning fixes. Fix linux build man: Note that the server may probe default "Device" options. Nuke RCS tags. Check for XINPUT ABI 3. fix compilation (upper/lower case typo)
39 lines
1.5 KiB
Text
39 lines
1.5 KiB
Text
$NetBSD: patch-ad,v 1.1 2009/05/22 19:05:57 tnn Exp $
|
|
|
|
Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
|
|
hw/xfree86/os-support/xf86OSmouse.h
|
|
|
|
----------------------------
|
|
revision 1.2
|
|
date: 2009/02/02 03:06:37; author: christos; state: Exp; lines: +4 -0
|
|
add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to
|
|
SetupMouse.
|
|
----------------------------
|
|
|
|
--- ./src/xf86OSmouse.h.orig 2009-05-19 15:15:31 +0300
|
|
+++ ./src/xf86OSmouse.h 2009-05-19 15:18:54 +0300
|
|
@@ -82,6 +82,7 @@ typedef Bool (*BuiltinPreInitProc)(Input
|
|
int flags);
|
|
typedef const char *(*DefaultProtocolProc)(void);
|
|
typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara);
|
|
+typedef Bool (*SetupMouseProc)(InputInfoPtr pInfo);
|
|
typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate,
|
|
int res);
|
|
typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol,
|
|
@@ -99,6 +100,7 @@ typedef struct {
|
|
BuiltinPreInitProc PreInit;
|
|
DefaultProtocolProc DefaultProtocol;
|
|
SetupAutoProc SetupAuto;
|
|
+ SetupMouseProc SetupMouse;
|
|
SetResProc SetPS2Res;
|
|
SetResProc SetBMRes;
|
|
SetResProc SetMiscRes;
|
|
@@ -141,6 +143,8 @@ typedef struct {
|
|
*
|
|
* SetBMRes: Set the resolution and sample rate for MSE_BM protocol types.
|
|
*
|
|
+ * SetupMouse: Called once after open to condition the file descriptor.
|
|
+ *
|
|
* SetMiscRes: Set the resolution and sample rate for MSE_MISC protocol types.
|
|
*
|
|
* FindDevice: This function gets called when no Device has been specified
|