1445N/A# Copyright (c) 2009, 2015, 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

1445N/A--- a/src/mouse.c Thu Mar 5 11:52:36 2015

1445N/A+++ b/src/mouse.c Thu Mar 5 11:56:15 2015

1445N/A@@ -1753,18 +1753,19 @@

1445N/A ErrorF("assigning %p name=%s\n", device, pInfo->name);

817N/A #endif

1351N/A MouseInitProperties(device);

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

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

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

817N/A+

1351N/A break;

1351N/A

1351N/A case DEVICE_ON:

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

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

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

1351N/A- else {

1445N/A #if defined(__NetBSD__) && defined(WSCONS_SUPPORT) && defined(WSMOUSEIO_SETVERSION)

1445N/A int version = WSMOUSE_EVENT_VERSION;

1445N/A if (ioctl(pInfo->fd, WSMOUSEIO_SETVERSION, &version) == -1)

1445N/A xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name);

1445N/A #endif

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

1351N/A if (pMse->xisbscale)

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

1351N/A else

1445N/A@@ -1820,8 +1821,6 @@

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

1351N/A pMse->buffer = NULL;

1351N/A }

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

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

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

1351N/A {

1351N/A RemoveBlockAndWakeupHandlers (MouseBlockHandler,

1445N/A@@ -1832,6 +1831,10 @@

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

1351N/A break;

1054N/A case DEVICE_CLOSE:

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

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

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

1351N/A+ }

1351N/A free(pMse->mousePriv);

1351N/A pMse->mousePriv = NULL;

1351N/A break;