943N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.

817N/A#

817N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

817N/A

1054N/Adiff -Nurp -x '*~' -x '*.orig' src/mouse.c src/mouse.c

1054N/A--- src/mouse.c 2010-08-14 01:04:54.000000000 -0700

1054N/A+++ src/mouse.c 2010-09-09 11:31:51.072960718 -0700

1054N/A@@ -1637,13 +1637,14 @@ MouseProc(DeviceIntPtr device, int what)

817N/A ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,

817N/A pInfo->name);

817N/A #endif

817N/A- break;

817N/A-

817N/A- case DEVICE_ON:

817N/A pInfo->fd = xf86OpenSerial(pInfo->options);

817N/A if (pInfo->fd == -1)

817N/A xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);

817N/A- else {

817N/A+

817N/A+ break;

817N/A+

817N/A+ case DEVICE_ON:

817N/A+ if (pInfo->fd != -1) {

817N/A if (pMse->xisbscale)

817N/A pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);

817N/A else

1054N/A@@ -1699,8 +1700,6 @@ MouseProc(DeviceIntPtr device, int what)

1054N/A XisbFree(pMse->buffer);

1054N/A pMse->buffer = NULL;

1054N/A }

1054N/A- xf86CloseSerial(pInfo->fd);

1054N/A- pInfo->fd = -1;

1054N/A if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)

1054N/A {

1054N/A RemoveBlockAndWakeupHandlers (MouseBlockHandler,

1054N/A@@ -1711,6 +1710,10 @@ MouseProc(DeviceIntPtr device, int what)

1054N/A device->public.on = FALSE;

817N/A break;

1054N/A case DEVICE_CLOSE:

1054N/A+ if (pInfo->fd != -1) {

1054N/A+ xf86CloseSerial(pInfo->fd);

1054N/A+ pInfo->fd = -1;

817N/A+ }

1054N/A xfree(pMse->mousePriv);

1054N/A pMse->mousePriv = NULL;

1054N/A break;