Wed Jul 8 00:30:52 2009 UTC ()
use strcasecmp() to check for netbsd "wsmouse".
auto-generated configs end up with "WSmouse".

fixes PR#41677.


(mrg)
diff -r1.5 -r1.6 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c

cvs diff -r1.5 -r1.6 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c (expand / switch to unified diff)

--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c 2009/06/12 05:53:58 1.5
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c 2009/07/08 00:30:52 1.6
@@ -1747,27 +1747,27 @@ MouseProc(DeviceIntPtr device, int what) @@ -1747,27 +1747,27 @@ MouseProc(DeviceIntPtr device, int what)
1747 1747
1748#ifdef EXTMOUSEDEBUG 1748#ifdef EXTMOUSEDEBUG
1749 ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom, 1749 ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
1750 pInfo->name); 1750 pInfo->name);
1751#endif 1751#endif
1752 break; 1752 break;
1753 1753
1754 case DEVICE_ON: 1754 case DEVICE_ON:
1755 pInfo->fd = xf86OpenSerial(pInfo->options); 1755 pInfo->fd = xf86OpenSerial(pInfo->options);
1756 if (pInfo->fd == -1) 1756 if (pInfo->fd == -1)
1757 xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name); 1757 xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
1758 else { 1758 else {
1759#if defined(__NetBSD__) && defined(WSCONS_SUPPORT) && defined(WSMOUSEIO_SETVERSION) 1759#if defined(__NetBSD__) && defined(WSCONS_SUPPORT) && defined(WSMOUSEIO_SETVERSION)
1760 if (!strcmp(pMse->protocol, "wsmouse")) { 1760 if (!strcasecmp(pMse->protocol, "wsmouse")) {
1761 int version = WSMOUSE_EVENT_VERSION; 1761 int version = WSMOUSE_EVENT_VERSION;
1762 if (ioctl(pInfo->fd, WSMOUSEIO_SETVERSION, &version) == -1) 1762 if (ioctl(pInfo->fd, WSMOUSEIO_SETVERSION, &version) == -1)
1763 xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name); 1763 xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name);
1764 } 1764 }
1765#endif 1765#endif
1766 if (pMse->xisbscale) 1766 if (pMse->xisbscale)
1767 pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4); 1767 pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
1768 else 1768 else
1769 pMse->buffer = XisbNew(pInfo->fd, 64); 1769 pMse->buffer = XisbNew(pInfo->fd, 64);
1770 if (!pMse->buffer) { 1770 if (!pMse->buffer) {
1771 xf86CloseSerial(pInfo->fd); 1771 xf86CloseSerial(pInfo->fd);
1772 pInfo->fd = -1; 1772 pInfo->fd = -1;
1773 } else { 1773 } else {