Commit 580e739d authored by Alan Coopersmith's avatar Alan Coopersmith

Strip trailing whitespace

cleanup done via: perl -p -i -e 's/[\t ]*$//'
"git diff -w" shows no changes - this is pure whitespace adjustment.
Signed-off-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
parent 1816cd91
......@@ -14,9 +14,9 @@ mouse \- __xservername__ mouse input driver
.B EndSection
.fi
.SH DESCRIPTION
.B mouse
is an __xservername__ input driver for mice. The driver supports most
available mouse types and interfaces, though the level of support for
.B mouse
is an __xservername__ input driver for mice. The driver supports most
available mouse types and interfaces, though the level of support for
types of mice depends on the OS.
.PP
The
......@@ -52,23 +52,23 @@ so that the host computer can automatically detect the mouse
and load an appropriate driver.
This driver supports this specification and can detect
popular PnP serial mouse models on most platforms.
.TP
.TP
Bus mouse
The bus mouse connects to a dedicated interface card in an expansion
slot.
Some older video cards, notably those from ATI, and integrated I/O
cards may also have a bus mouse connector.
.PP
The interface type of the mouse can be determined by looking at the connector
The interface type of the mouse can be determined by looking at the connector
of the mouse.
USB mice have a thin rectangular connector.
PS/2 mice are equipped with a small, round DIN 6-pin connector.
Serial mouse have a D-Sub female 9- or 25-pin connector.
Bus mice have either a D-Sub male 9-pin connector
Bus mice have either a D-Sub male 9-pin connector
or a round DIN 9-pin connector.
Some mice come with adapters with which the connector can
Some mice come with adapters with which the connector can
be converted to another. If you are to use such an adapter,
remember that the connector at the very end of the mouse/adapter pair is
remember that the connector at the very end of the mouse/adapter pair is
what matters.
.SH CONFIGURATION DETAILS
.PP
......@@ -276,7 +276,7 @@ number that is the target of the lock button.
.TP 7
.BI "Option \*qDragLockButtons\*q \*q" "M1" \*q
Sets a \*qmaster drag lock button\*q that acts as a \*qMeta Key\*q
indicating that the next button pressed is to be
indicating that the next button pressed is to be
\*qdrag locked\*q.
.TP 7
.BI "Option \*qClearDTR\*q \*q" boolean \*q
......
......@@ -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 = $(CWARNFLAGS)
AM_CFLAGS = $(CWARNFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS)
# this is obnoxious:
......
......@@ -179,7 +179,7 @@ static struct {
{ MOUSE_PROTO_THINK, "ThinkingMouse" },
{ MOUSE_PROTO_SYSMOUSE, "SysMouse" }
};
static const char *
SetupAuto(InputInfoPtr pInfo, int *protoPara)
{
......@@ -193,7 +193,7 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara)
/* set the driver operation level, if applicable */
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
/* interrogate the driver and get some intelligence on the device. */
hw.iftype = MOUSE_IF_UNKNOWN;
hw.model = MOUSE_MODEL_GENERIC;
......@@ -301,7 +301,7 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
continue;
} else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
/* Check if /dev/mouse is the same as /dev/sysmouse. */
if (devMouse && fstat(fd, &sb) == 0 &&
if (devMouse && fstat(fd, &sb) == 0 &&
devMouseStat.st_dev == sb.st_dev &&
devMouseStat.st_ino == sb.st_ino) {
/* If the same, use /dev/sysmouse. */
......@@ -390,7 +390,7 @@ wsconsReadInput(InputInfoPtr pInfo)
{
MouseDevPtr pMse;
static struct wscons_event eventList[NUMEVENTS];
int n, c;
int n, c;
struct wscons_event *event = eventList;
unsigned char *pBuf;
......@@ -493,16 +493,16 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
pUsbMse = pMse->mousePriv;
switch (what) {
case DEVICE_INIT:
case DEVICE_INIT:
pPointer->public.on = FALSE;
for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
map[nbuttons + 1] = nbuttons + 1;
InitPointerDeviceStruct((DevicePtr)pPointer,
map,
InitPointerDeviceStruct((DevicePtr)pPointer,
map,
min(pMse->buttons, MSE_MAXBUTTONS),
miPointerGetMotionEvents,
miPointerGetMotionEvents,
pMse->Ctrl,
miPointerGetMotionBufferSize());
......@@ -527,7 +527,7 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
pInfo->fd = -1;
} else {
xf86FlushInput(pInfo->fd);
if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
pInfo))
AddEnabledDevice(pInfo->fd);
}
......@@ -569,7 +569,7 @@ usbReadInput(InputInfoPtr pInfo)
UsbMsePtr pUsbMse;
int buttons = pMse->lastButtons;
int dx = 0, dy = 0, dz = 0, dw = 0;
int n, c;
int n, c;
unsigned char *pBuf;
pMse = pInfo->private;
......@@ -590,7 +590,7 @@ usbReadInput(InputInfoPtr pInfo)
/* discard packets with an id that don't match the mouse */
/* XXX this is probably not the right thing */
if (pUsbMse->iid != 0) {
if (*pBuf++ != pUsbMse->iid)
if (*pBuf++ != pUsbMse->iid)
return;
}
dx = hid_get_data(pBuf, &pUsbMse->loc_x);
......@@ -600,7 +600,7 @@ usbReadInput(InputInfoPtr pInfo)
buttons = 0;
for (n = 0; n < pMse->buttons; n++) {
if (hid_get_data(pBuf, &pUsbMse->loc_btn[n]))
if (hid_get_data(pBuf, &pUsbMse->loc_btn[n]))
buttons |= (1 << UMS_BUT(n));
}
pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw);
......@@ -748,7 +748,7 @@ bsdMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
}
#endif
return TRUE;
}
}
OSMouseInfoPtr
OSMouseInit(int flags)
......
......@@ -51,7 +51,7 @@
typedef unsigned short kev_type; /* kd event type */
typedef unsigned char Scancode;
struct mouse_motion {
struct mouse_motion {
short mm_deltaX; /* units? */
short mm_deltaY;
};
......@@ -66,7 +66,7 @@ typedef struct {
} value;
} kd_event;
/*
/*
* kd_event ID's.
*/
#define MOUSE_LEFT 1 /* mouse left button up/down */
......@@ -87,7 +87,7 @@ OsMouseReadInput(InputInfoPtr pInfo)
MouseDevPtr pMse;
static kd_event eventList[NUMEVENTS];
static int remainder = 0;
int n, c;
int n, c;
kd_event *event = eventList;
unsigned char *pBuf;
......@@ -156,7 +156,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
pInfo->fd = xf86OpenSerial(pInfo->options);
pInfo->fd = xf86OpenSerial(pInfo->options);
if (pInfo->fd == -1) {
if (xf86GetAllowMouseOpenFail())
xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
......@@ -174,7 +174,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
/* Setup the local procs. */
pInfo->read_input = OsMouseReadInput;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->flags |= XI86_CONFIGURED;
#endif
......
This diff is collapsed.
......@@ -11,7 +11,7 @@
#endif
#include "mouse.h"
#include "xf86Xinput.h"
#include "xf86Xinput.h"
/* Private interface for the mouse driver. */
typedef enum {
......@@ -63,7 +63,7 @@ typedef struct {
int acc;
CARD32 pnpLast;
Bool disablePnPauto;
float fracdx,fracdy;
float fracdx,fracdy;
float sensitivity;
} mousePrivRec, *mousePrivPtr;
......
......@@ -91,11 +91,11 @@ static symtab_t pnpprod[] = {
* EzScroll returns PNP0F04 in the compatible device field; but it
* doesn't look compatible... XXX
*/
{ "PNP0F04", PROT_MSC }, /* MouseSystems */
{ "PNP0F05", PROT_MSC }, /* MouseSystems */
{ "PNP0F04", PROT_MSC }, /* MouseSystems */
{ "PNP0F05", PROT_MSC }, /* MouseSystems */
#ifdef notyet
{ "PNP0F06", PROT_??? }, /* Genius Mouse */
{ "PNP0F07", PROT_??? }, /* Genius Mouse */
{ "PNP0F06", PROT_??? }, /* Genius Mouse */
{ "PNP0F07", PROT_??? }, /* Genius Mouse */
#endif
{ "PNP0F08", PROT_LOGIMAN }, /* Logitech serial */
{ "PNP0F09", PROT_MS }, /* MS BallPoint serial */
......@@ -114,7 +114,7 @@ static symtab_t pnpprod[] = {
#ifdef notyet
{ "PNP0F14", PROT_??? }, /* MS Kids Mouse */
#endif
{ "PNP0F15", PROT_BM }, /* Logitech bus */
{ "PNP0F15", PROT_BM }, /* Logitech bus */
#ifdef notyet
{ "PNP0F16", PROT_??? }, /* Logitech SWIFT */
#endif
......@@ -159,7 +159,7 @@ MouseGetSerialPnpProtocol(InputInfoPtr pInfo)
int len;
Bool prePNP;
if ((len = pnpgets(pInfo, buf, &prePNP)) > 0)
if ((len = pnpgets(pInfo, buf, &prePNP)) > 0)
{
if (!prePNP) {
if (pnpparse(pInfo, &pnpid, buf, len) &&
......@@ -181,7 +181,7 @@ MouseGetPnpProtocol(InputInfoPtr pInfo)
mousePrivPtr mPriv = (mousePrivPtr)pMse->mousePriv;
MouseProtocolID val;
CARD32 last;
if ((val = MouseGetSerialPnpProtocol(pInfo)) != PROT_UNKNOWN) {
if (val == MouseGetSerialPnpProtocol(pInfo))
return val;
......@@ -199,9 +199,9 @@ MouseGetPnpProtocol(InputInfoPtr pInfo)
#endif
mPriv->disablePnPauto = TRUE;
return PROT_UNKNOWN;
}
}
}
#ifdef EXTMOUSEDEBUG
if (mPriv->disablePnPauto)
xf86ErrorF("Mouse: Enabling PnP\n");
......@@ -215,19 +215,19 @@ MouseGetPnpProtocol(InputInfoPtr pInfo)
}
/*
* Try to elicit a PnP ID as described in
* Microsoft, Hayes: "Plug and Play External COM Device Specification,
* Try to elicit a PnP ID as described in
* Microsoft, Hayes: "Plug and Play External COM Device Specification,
* rev 1.00", 1995.
*
* The routine does not fully implement the COM Enumerator as per Section
* 2.1 of the document. In particular, we don't have idle state in which
* the driver software monitors the com port for dynamic connection or
* removal of a device at the port, because `moused' simply quits if no
* the driver software monitors the com port for dynamic connection or
* removal of a device at the port, because `moused' simply quits if no
* device is found.
*
* In addition, as PnP COM device enumeration procedure slightly has
* In addition, as PnP COM device enumeration procedure slightly has
* changed since its first publication, devices which follow earlier
* revisions of the above spec. may fail to respond if the rev 1.0
* revisions of the above spec. may fail to respond if the rev 1.0
* procedure is used. XXX
*/
static int
......@@ -236,9 +236,9 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
int i;
char c;
pointer pnpOpts;
#if 0
/*
/*
* This is the procedure described in rev 1.0 of PnP COM device spec.
* Unfortunately, some devices which conform to earlier revisions of
* the spec gets confused and do not return the ID string...
......@@ -317,11 +317,11 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
/* collect PnP COM device ID (2.1.7) */
i = 0;
*prePNP = FALSE;
usleep(200000); /* the mouse must send `Begin ID' within 200msec */
while (xf86ReadSerial(pInfo->fd, &c, 1) == 1) {
/* we may see "M", or "M3..." before `Begin ID' */
if (c == 'M')
if (c == 'M')
*prePNP = TRUE;
if ((c == 0x08) || (c == 0x28)) { /* Begin ID */
......@@ -332,7 +332,7 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
}
if (*prePNP)
buf[i++] = c;
if (xf86WaitForInput(pInfo->fd, 200000) <= 0)
break;
}
......@@ -342,7 +342,7 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
}
if (*prePNP)
return i;
++c; /* make it `End ID' */
for (;;) {
if (xf86WaitForInput(pInfo->fd, 200000) <= 0)
......@@ -359,9 +359,9 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
return i;
/*
* According to PnP spec, we should set DTR = 1 and RTS = 0 while
* in idle state. But, `moused' shall set DTR = RTS = 1 and proceed,
* assuming there is something at the port even if it didn't
* According to PnP spec, we should set DTR = 1 and RTS = 0 while
* in idle state. But, `moused' shall set DTR = RTS = 1 and proceed,
* assuming there is something at the port even if it didn't
* respond to the PnP enumeration procedure.
*/
disconnect_idle:
......@@ -450,7 +450,7 @@ pnpparse(InputInfoPtr pInfo, pnpid_t *id, char *buf, int len)
break;
}
/*
* PnP COM spec prior to v0.96 allowed '*' in this field,
* PnP COM spec prior to v0.96 allowed '*' in this field,
* it's not allowed now; just ignore it.
*/
if (buf[j] == '*')
......@@ -483,9 +483,9 @@ pnpparse(InputInfoPtr pInfo, pnpid_t *id, char *buf, int len)
sprintf(s, "%02X", sum & 0x0ff);
if (strncmp(s, &buf[len - 3], 2) != 0) {
#if 0
/*
/*
* Checksum error!!
* I found some mice do not comply with the PnP COM device
* I found some mice do not comply with the PnP COM device
* spec regarding checksum... XXX
*/
return FALSE;
......@@ -582,7 +582,7 @@ ps2SendPacket(InputInfoPtr pInfo, unsigned char *bytes, int len)
{
unsigned char c;
int i,j;
#ifdef DEBUG
xf86ErrorF("Ps/2 data package:");
for (i = 0; i < len; i++)
......@@ -608,7 +608,7 @@ ps2SendPacket(InputInfoPtr pInfo, unsigned char *bytes, int len)
if (c == 0xFE) /* resend */
continue;
if (c == 0xFC) /* error */
return FALSE;
......@@ -623,10 +623,10 @@ ps2SendPacket(InputInfoPtr pInfo, unsigned char *bytes, int len)
if (j == 10)
return FALSE;
}
return TRUE;
}
static Bool
ps2DisableDataReporting(InputInfoPtr pInfo)
{
......@@ -649,7 +649,7 @@ ps2GetDeviceID(InputInfoPtr pInfo)
usleep(30000);
xf86FlushInput(pInfo->fd);
if (!ps2SendPacket(pInfo, packet, sizeof(packet)))
if (!ps2SendPacket(pInfo, packet, sizeof(packet)))
return -1;
while (1) {
if (!readMouse(pInfo,&u))
......@@ -673,7 +673,7 @@ ps2Reset(InputInfoPtr pInfo)
#ifdef DEBUG
xf86ErrorF("PS/2 Mouse reset\n");
#endif
if (!ps2SendPacket(pInfo, packet, sizeof(packet)))
if (!ps2SendPacket(pInfo, packet, sizeof(packet)))
return FALSE;
/* we need a little delay here */
xf86WaitForInput(pInfo->fd, 500000);
......@@ -681,11 +681,11 @@ ps2Reset(InputInfoPtr pInfo)
if (!readMouse(pInfo,&u)) {
goto EXIT;
}
if (u != reply[i])
if (u != reply[i])
goto EXIT;
}
return TRUE;
EXIT:
xf86FlushInput(pInfo->fd);
return FALSE;
......@@ -700,9 +700,9 @@ probePs2ProtocolPnP(InputInfoPtr pInfo)
xf86FlushInput(pInfo->fd);
ps2DisableDataReporting(pInfo);
if (ps2Reset(pInfo)) { /* Reset PS2 device */
unsigned char seq[] = { 243, 200, 243, 100, 243, 80 };
unsigned char seq[] = { 243, 200, 243, 100, 243, 80 };
/* Try to identify Intelli Mouse */
if (ps2SendPacket(pInfo, seq, sizeof(seq))) {
u = ps2GetDeviceID(pInfo);
......@@ -713,21 +713,21 @@ probePs2ProtocolPnP(InputInfoPtr pInfo)
u = ps2GetDeviceID(pInfo);
if (u == 0x04)
ret = PROT_EXPPS2;
else
else
ret = PROT_IMPS2;
}
}
} else if (ps2Reset(pInfo)) /* reset again to find sane state */
ret = PROT_PS2;
}
if (ret != PROT_UNKNOWN)
if (ret != PROT_UNKNOWN)
ps2EnableDataReporting(pInfo);
}
return ret;
}
static struct ps2protos {
int Id;
int Id;
MouseProtocolID protoID;
} ps2 [] = {
{ 0x0, PROT_PS2 },
......@@ -750,12 +750,12 @@ getPs2ProtocolPnP(InputInfoPtr pInfo)
while (--count)
if (ps2DisableDataReporting(pInfo))
break;
if (!count) {
proto = PROT_UNKNOWN;
goto EXIT;
}
if ((Id = ps2GetDeviceID(pInfo)) == -1) {
proto = PROT_UNKNOWN;
goto EXIT;
......@@ -773,10 +773,10 @@ getPs2ProtocolPnP(InputInfoPtr pInfo)
goto EXIT;
}
}
proto = PROT_UNKNOWN;
xf86Msg(X_ERROR,"Found unknown PS/2 proto ID %x\n",Id);
EXIT:
xf86FlushInput(pInfo->fd);
return proto;
......
......@@ -69,7 +69,7 @@
# include <sys/vuid_wheel.h>
#endif
/* Support for scaling absolute coordinates to screen size in
/* Support for scaling absolute coordinates to screen size in
* Solaris 10 updates and beyond */
#if !defined(HAVE_ABSOLUTE_MOUSE_SCALING)
# ifdef MSIOSRESOLUTION /* Defined in msio.h if scaling support present */
......@@ -94,7 +94,7 @@ static const char *solarisMouseDevs[] = {
};
typedef struct _VuidMseRec {
struct _VuidMseRec *next;
struct _VuidMseRec *next;
InputInfoPtr pInfo;
Firm_event event;
unsigned char * buffer;
......@@ -225,11 +225,11 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
pMse->xisbscale = sizeof(Firm_event);
#ifdef HAVE_ABSOLUTE_MOUSE_SCALING
#ifdef HAVE_ABSOLUTE_MOUSE_SCALING
pVuidMse->absres.height = pVuidMse->absres.width = 0;
#endif
pVuidMse->pInfo = pInfo;
pVuidMse->next = vuidMouseList;
pVuidMse->next = vuidMouseList;
vuidMouseList = pVuidMse;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
......@@ -239,27 +239,27 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
}
static void
vuidFlushAbsEvents(InputInfoPtr pInfo, int absX, int absY,
vuidFlushAbsEvents(InputInfoPtr pInfo, int absX, int absY,
Bool *absXset, Bool *absYset)
{
#ifdef DEBUG
ErrorF("vuidFlushAbsEvents: %d,%d (set: %d, %d)\n", absX, absY,
ErrorF("vuidFlushAbsEvents: %d,%d (set: %d, %d)\n", absX, absY,
*absXset, *absYset);
#endif
if ((*absXset) && (*absYset)) {
xf86PostMotionEvent(pInfo->dev,
xf86PostMotionEvent(pInfo->dev,
/* is_absolute: */ TRUE,
/* first_valuator: */ 0,
/* num_valuators: */ 2,
absX, absY);
} else if (*absXset) {
xf86PostMotionEvent(pInfo->dev,
xf86PostMotionEvent(pInfo->dev,
/* is_absolute: */ TRUE,
/* first_valuator: */ 0,
/* num_valuators: */ 1,
absX);
} else if (*absYset) {
xf86PostMotionEvent(pInfo->dev,
xf86PostMotionEvent(pInfo->dev,
/* is_absolute: */ TRUE,
/* first_valuator: */ 1,
/* num_valuators: */ 1,
......@@ -364,7 +364,7 @@ vuidReadInput(InputInfoPtr pInfo)
absYset = TRUE;
break;
}
}
}
#ifdef HAVE_VUID_WHEEL
else if (vuid_in_range(VUID_WHEEL, pVuidMse->event.id)) {
if (vuid_id_offset(pVuidMse->event.id) == 0)
......@@ -404,7 +404,7 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse)
if (!pScr->currentMode)
return;
if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) ||
if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) ||
(pVuidMse->absres.height != pScr->currentMode->VDisplay))
{
pVuidMse->absres.width = pScr->currentMode->HDisplay;
......@@ -415,14 +415,14 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse)
} while ( (result != 0) && (errno == EINTR) );
if (result != 0) {
xf86Msg(X_WARNING,
xf86Msg(X_WARNING,
"%s: couldn't set absolute mouse scaling resolution: %s\n",
pInfo->name, strerror(errno));
#ifdef DEBUG
} else {
xf86Msg(X_INFO,
"%s: absolute mouse scaling resolution set to %d x %d\n",
pInfo->name,
xf86Msg(X_INFO,
"%s: absolute mouse scaling resolution set to %d x %d\n",
pInfo->name,
pVuidMse->absres.width, pVuidMse->absres.height);
#endif
}
......@@ -433,7 +433,7 @@ static void vuidMouseAdjustFrame(int index, int x, int y, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[index];
ScreenPtr pScreen = pScrn->pScreen;
xf86AdjustFrameProc *wrappedAdjustFrame
xf86AdjustFrameProc *wrappedAdjustFrame
= (xf86AdjustFrameProc *) vuidMouseGetScreenPrivate(pScreen);
VuidMsePtr m;
ScreenPtr ptrCurScreen;
......@@ -472,7 +472,7 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
if (pVuidMse == NULL) {
return BadImplementation;
}
switch (what) {
case DEVICE_INIT:
......@@ -492,16 +492,16 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
}
vuidMouseGeneration = serverGeneration;
}
#endif
#endif
ret = pVuidMse->wrapped_device_control(pPointer, what);
break;
case DEVICE_ON:
ret = pVuidMse->wrapped_device_control(pPointer, DEVICE_ON);
if ((ret == Success) && (pInfo->fd != -1)) {
int fmt = VUID_FIRM_EVENT;
if (pVuidMse->strmod) {
/* Check to see if module is already pushed */
SYSCALL(i = ioctl(pInfo->fd, I_FIND, pVuidMse->strmod));
......@@ -525,9 +525,9 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
pInfo->name, strerror(errno));
}
vuidMouseWheelInit(pInfo);
#ifdef HAVE_ABSOLUTE_MOUSE_SCALING
#ifdef HAVE_ABSOLUTE_MOUSE_SCALING
vuidMouseSendScreenSize(screenInfo.screens[0], pVuidMse);
#endif
#endif
xf86FlushInput(pInfo->fd);
/* Allocate here so we don't alloc in ReadInput which may be called
......@@ -573,7 +573,7 @@ sunMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
return vuidPreInit(pInfo, protocol, flags);
}
return TRUE;
}
}
static const char **
BuiltinNames(void)
......@@ -600,7 +600,7 @@ DefaultProtocol(void)
}
static Bool
solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol,
solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol,
const char **device)
{
const char **pdev, **pproto;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment