Attachment 184 Details for Bug 434 – Patch to xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c

[patch] Patch to xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c

sun_mouse.c-patch (text/plain), 10.08 KB, created by Alan Coopersmith on 2004-04-08 21:55:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2004-04-08 21:55:49 UTC

Size: 10.08 KB

patch

obsolete

>--- cvs-rw/xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c	Fri Nov 14 08:48:56 2003
>+++ sx86/xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c	Thu Apr  8 19:15:33 2004
>@@ -1,4 +1,5 @@
> /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */
>+/* $XdotOrg$ */
> /*
>  * Copyright 1999-2001 The XFree86 Project, Inc.  All Rights Reserved.
>  *
>@@ -24,17 +25,54 @@
>  * dealings in this Software without prior written authorization from the
>  * XFree86 Project.
>  */
>+/* Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
>+ *
>+ * Permission is hereby granted, free of charge, to any person obtaining a
>+ * copy of this software and associated documentation files (the
>+ * "Software"), to deal in the Software without restriction, including
>+ * without limitation the rights to use, copy, modify, merge, publish,
>+ * distribute, and/or sell copies of the Software, and to permit persons
>+ * to whom the Software is furnished to do so, provided that the above
>+ * copyright notice(s) and this permission notice appear in all copies of
>+ * the Software and that both the above copyright notice(s) and this
>+ * permission notice appear in supporting documentation.
>+ * 
>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
>+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
>+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
>+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
>+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
>+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
>+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
>+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>+ * 
>+ * Except as contained in this notice, the name of a copyright holder
>+ * shall not be used in advertising or otherwise to promote the sale, use
>+ * or other dealings in this Software without prior written authorization
>+ * of the copyright holder.
>+ */
> 
> #include "xf86.h"
> #include "xf86_OSlib.h"
> #include "xf86OSmouse.h"
> 
>-#if defined(__SOL8__) || !defined(i386)
>+#if defined(__SOL8__) || !defined(__i386)
> 
> #include "xisb.h"
> #include "mipointer.h"
>+#include <sys/stropts.h>
> #include <sys/vuid_event.h>
>+#include <sys/msio.h>
> 
>+/* Wheel mouse support in VUID drivers in Solaris 9 updates & Solaris 10 */
>+#ifdef WHEEL_DEVID /* Defined in vuid_event.h if VUID wheel support present */
>+# define HAVE_VUID_WHEEL
>+#endif
>+#ifdef HAVE_VUID_WHEEL
>+# include <sys/vuid_wheel.h>
>+#endif
>+
> /* Names of protocols that are handled internally here. */
> 
> static const char *internalNames[] = {
>@@ -42,9 +80,19 @@
> 	NULL
> };
> 
>+static const char *solarisMouseDevs[] = {
>+    /* Device file:	Protocol: 			*/
>+    "/dev/mouse",	"VUID",		/* USB or SPARC */
>+#ifdef __i386
>+    "/dev/kdmouse",	"PS/2",		/* PS/2 */
>+#endif
>+    NULL
>+};
>+
> typedef struct _VuidMseRec {
>     Firm_event event;
>     unsigned char *buffer;
>+    char *strmod;
> } VuidMseRec, *VuidMsePtr;
> 
> 
>@@ -51,6 +99,45 @@
> static int  vuidMouseProc(DeviceIntPtr pPointer, int what);
> static void vuidReadInput(InputInfoPtr pInfo);
> 
>+/*
>+ * Initialize and enable the mouse wheel, if present.
>+ *
>+ * Returns 1 if mouse wheel was successfully enabled.
>+ * Returns 0 if an error occurred or if there is no mouse wheel.
>+ */
>+static int
>+vuidMouseWheelInit(InputInfoPtr pInfo)
>+{
>+#ifdef HAVE_VUID_WHEEL
>+    wheel_state wstate;
>+    int nwheel = -1;
>+
>+    wstate.vers = VUID_WHEEL_STATE_VERS;
>+    wstate.id = 0;
>+    wstate.stateflags = -1;
>+
>+    if (ioctl(pInfo->fd, VUIDGWHEELCOUNT, &nwheel) != 0)
>+	return (0);
>+
>+    if (ioctl(pInfo->fd, VUIDGWHEELSTATE, &wstate) != 0) {
>+	xf86Msg(X_WARNING, "%s: couldn't get wheel state\n", pInfo->name);
>+	return (0);
>+    }
>+
>+    wstate.stateflags |= VUID_WHEEL_STATE_ENABLED;
>+
>+    if (ioctl(pInfo->fd, VUIDSWHEELSTATE, &wstate) != 0) {
>+	xf86Msg(X_WARNING, "%s: couldn't enable wheel\n", pInfo->name);
>+	return (0);
>+    }
>+
>+    return (1);
>+#else
>+    return (0);
>+#endif
>+}
>+
>+
> /* This function is called when the protocol is "VUID". */
> static Bool
> vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
>@@ -57,6 +144,7 @@
> {
>     MouseDevPtr pMse = pInfo->private;
>     VuidMsePtr pVuidMse;
>+    int buttons;
> 
>     pVuidMse = xalloc(sizeof(VuidMseRec));
>     if (pVuidMse == NULL) {
>@@ -84,7 +172,40 @@
> 	    return FALSE;
> 	}
>     }
>+
>     pVuidMse->buffer = (unsigned char *)&pVuidMse->event;
>+
>+    pVuidMse->strmod = xf86SetStrOption(pInfo->options, "StreamsModule", NULL);
>+    if (pVuidMse->strmod && 
>+      	(ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
>+	xf86Msg(X_ERROR,
>+	  "%s: cannot push module '%s' onto mouse device: %s\n",
>+	  pInfo->name, pVuidMse->strmod, strerror(errno));
>+	xf86CloseSerial(pInfo->fd);
>+	pInfo->fd = -1;
>+	xfree(pVuidMse);
>+	xfree(pMse);
>+	return FALSE;
>+    }
>+
>+    buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
>+    if (buttons == 0) {
>+	if(ioctl(pInfo->fd, MSIOBUTTONS, &buttons) == 0) {
>+	    pInfo->conf_idev->commonOptions =
>+	      xf86ReplaceIntOption(pInfo->conf_idev->commonOptions, 
>+		"Buttons", buttons);
>+	    xf86Msg(X_INFO, "%s: Setting Buttons option to \"%d\"\n",
>+	      pInfo->name, buttons);
>+	}
>+    }
>+
>+    if (pVuidMse->strmod && 
>+      (ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
>+	xf86Msg(X_WARNING,
>+	  "%s: cannot pop module '%s' off mouse device: %s\n",
>+	  pInfo->name, pVuidMse->strmod, strerror(errno));
>+    }
>+
>     xf86CloseSerial(pInfo->fd);
>     pInfo->fd = -1;
> 
>@@ -112,6 +233,7 @@
>     unsigned int n;
>     int c; 
>     unsigned char *pBuf;
>+    int wmask;
> 
>     pMse = pInfo->private;
>     pVuidMse = pMse->mousePriv;
>@@ -154,7 +276,15 @@
> 		dy -= delta;
> 		break;
> 	    }
>+	} 
>+#ifdef HAVE_VUID_WHEEL
>+	else if (vuid_in_range(VUID_WHEEL, pVuidMse->event.id)) {
>+	    if (vuid_id_offset(pVuidMse->event.id) == 0)
>+		dz -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
>+	    else
>+		dw -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
> 	}
>+#endif
> 
> 	n = 0;
> 	if ((c = XisbRead(pMse->buffer)) >= 0) {
>@@ -219,9 +349,20 @@
> 		pInfo->fd = -1;
> 	    } else {
> 	        int fmt = VUID_FIRM_EVENT;
>-		ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
>-		xf86FlushInput(pInfo->fd);
>-		AddEnabledDevice(pInfo->fd);
>+
>+		if (pVuidMse->strmod && 
>+		    (ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
>+		    xf86Msg(X_ERROR,
>+		      "%s: cannot push module '%s' onto mouse device: %s\n",
>+		      pInfo->name, pVuidMse->strmod, strerror(errno));
>+		    xf86CloseSerial(pInfo->fd);
>+		    pInfo->fd = -1;
>+		} else {
>+		    ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
>+		    vuidMouseWheelInit(pInfo);
>+		    xf86FlushInput(pInfo->fd);
>+		    AddEnabledDevice(pInfo->fd);
>+		}
> 	    }
> 	}
> 	pMse->lastButtons = 0;
>@@ -237,6 +378,12 @@
> 		XisbFree(pMse->buffer);
> 		pMse->buffer = NULL;
> 	    }
>+	    if (pVuidMse->strmod && 
>+		(ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
>+		xf86Msg(X_WARNING,
>+		      "%s: cannot pop module '%s' off mouse device: %s\n",
>+		      pInfo->name, pVuidMse->strmod, strerror(errno));
>+	    }
> 	    xf86CloseSerial(pInfo->fd);
> 	    pInfo->fd = -1;
> 	}
>@@ -278,21 +425,98 @@
> static const char *
> DefaultProtocol(void)
> {
>-    return "VUID";
>+    return "Auto";
> }
> 
>+static Bool
>+solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol, 
>+	const char **device)
>+{
>+    const char **pdev, **pproto, *dev = NULL;
>+    int fd = -1;
>+    Bool found;
>+
>+    for (pdev = solarisMouseDevs; *pdev; pdev += 2) {
>+	pproto = pdev + 1;
>+	if ((*protocol != NULL) && (strcmp(*protocol, "Auto") != 0) &&
>+	  (*pproto != NULL) && (strcmp(*pproto, *protocol) != 0)) {
>+	    continue;
>+	}
>+	if ((*device != NULL) && (strcmp(*device, *pdev) != 0)) {
>+	    continue;
>+	}
>+        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
>+	if (fd == -1) {
>+#ifdef DEBUG
>+	    ErrorF("Cannot open %s (%s)\n", pdev, strerror(errno));
>+#endif
>+	} else {
>+	    found = TRUE;
>+	    if ((*pproto != NULL) && (strcmp(*pproto, "VUID") == 0)) {
>+		int i;
>+		if (ioctl(fd, VUIDGFORMAT, &i) < 0) {
>+		    found = FALSE;
>+		}
>+	    }
>+	    close(fd);
>+	    if (found == TRUE) {
>+		if (*pproto != NULL) {
>+		    *protocol = *pproto;
>+		}
>+		*device = *pdev;
>+		return TRUE;
>+	    }
>+	}
>+    }
>+    return FALSE;
>+}
>+
> static const char *
> SetupAuto(InputInfoPtr pInfo, int *protoPara)
> {
>-    return DefaultProtocol();
>+    const char *pdev = NULL;
>+    const char *pproto = NULL;
>+    MouseDevPtr pMse = pInfo->private;
>+
>+    if (pInfo->fd == -1) {
>+	/* probe to find device/protocol to use */
>+	if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
>+	    /* Set the Device option. */
>+	    pInfo->conf_idev->commonOptions =
>+	     xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
>+	    xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
>+	      pInfo->name, pdev);
>+	}
>+    } else if (pMse->protocolID == PROT_AUTO) {
>+	pdev = xf86CheckStrOption(pInfo->conf_idev->commonOptions, 
>+		"Device", NULL);
>+	solarisMouseAutoProbe(pInfo, &pproto, &pdev);
>+    }
>+    return pproto;
> }
> 
>-#else /* __SOL8__ || !i386 */
>+static const char *
>+FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
>+{
>+    const char *pdev = NULL;
>+    const char *pproto = protocol;
> 
>+    if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
>+	/* Set the Device option. */
>+	pInfo->conf_idev->commonOptions =
>+	  xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
>+	xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
>+	  pInfo->name, pdev);
>+    }
>+    return pdev;
>+}
>+
>+#else /* __SOL8__ || !__i386 */
>+
> #undef MSE_MISC
> #define MSE_MISC 0
> 
>-#endif /* !__SOL8__ && i386 */
>+#endif /* !__SOL8__ && __i386 */
> 
> static int
> SupportedInterfaces(void)
>@@ -310,12 +534,13 @@
>     if (!p)
> 	return NULL;
>     p->SupportedInterfaces = SupportedInterfaces;
>-#if defined(__SOL8__) || !defined(i386)
>+#if defined(__SOL8__) || !defined(__i386)
>     p->BuiltinNames = BuiltinNames;
>     p->CheckProtocol = CheckProtocol;
>     p->PreInit = sunMousePreInit;
>     p->DefaultProtocol = DefaultProtocol;
>     p->SetupAuto = SetupAuto;
>+    p->FindDevice = FindDevice;
> #endif
>     return p;
> }

Actions: View | Splinter Review

Attachments on bug 434: 184

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.