Attachment 44276 Details for Bug 34794 – ver 4 (git-formatted patch)

[patch] ver 4 (git-formatted patch)

0001-Fixes-https-bugs.freedesktop.org-show_bug.cgi-id-347.patch (text/plain), 3.00 KB, created by Alexandr Shadchin on 2011-03-09 07:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandr Shadchin

Created: 2011-03-09 07:17:46 UTC

Size: 3.00 KB

patch

obsolete

>From 7d6be374bf9b74abe5f2694a2a90022504d6e0f9 Mon Sep 17 00:00:00 2001
>From: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
>Date: Wed, 9 Mar 2011 20:09:59 +0500
>Subject: [PATCH mouse] Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=34794
>
>Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
>---
> src/bsd_mouse.c |   27 +--------------------------
> src/mouse.c     |    5 +++++
> src/mouse.h     |    1 +
> 3 files changed, 7 insertions(+), 26 deletions(-)
>
>diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
>index e9e2649..14b529d 100644
>--- a/src/bsd_mouse.c
>+++ b/src/bsd_mouse.c
>@@ -102,7 +102,7 @@ SupportedInterfaces(void)
> #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
>     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
> #else
>-    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
>+    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
> #endif
> }
> 
>@@ -454,31 +454,6 @@ wsconsPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
> {
>     MouseDevPtr pMse = pInfo->private;
> 
>-    pMse->protocol = protocol;
>-    xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
>-
>-    /* Collect the options, and process the common options. */
>-    COLLECT_INPUT_OPTIONS(pInfo, NULL);
>-    xf86ProcessCommonOptions(pInfo, pInfo->options);
>-
>-    /* Check if the device can be opened. */
>-    pInfo->fd = xf86OpenSerial(pInfo->options);
>-    if (pInfo->fd == -1) {
>-	if (xf86GetAllowMouseOpenFail())
>-	    xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
>-	else {
>-	    xf86Msg(X_ERROR, "%s: cannot open input device\n", pInfo->name);
>-	    free(pMse);
>-	    pInfo->private = NULL;
>-	    return FALSE;
>-	}
>-    }
>-    xf86CloseSerial(pInfo->fd);
>-    pInfo->fd = -1;
>-
>-    /* Process common mouse options (like Emulate3Buttons, etc). */
>-    pMse->CommonOptions(pInfo);
>-
>     /* Setup the local input proc. */
>     pInfo->read_input = wsconsReadInput;
>     pMse->xisbscale = sizeof(struct wscons_event);
>diff --git a/src/mouse.c b/src/mouse.c
>index d2377ad..edb998f 100644
>--- a/src/mouse.c
>+++ b/src/mouse.c
>@@ -252,6 +252,7 @@ static MouseProtocolRec mouseProtocols[] = {
> 
>     /* Misc (usually OS-specific) */
>     { "SysMouse",		MSE_MISC,	mlDefaults,	PROT_SYSMOUSE },
>+    { "WSMouse",		MSE_MISC,	NULL,		PROT_WSMOUSE },
> 
>     /* end of list */
>     { NULL,			MSE_NONE,	NULL,		PROT_UNKNOWN }
>@@ -817,6 +818,10 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device,
>     }
> 
>     switch (protocolID) {
>+        case PROT_WSMOUSE:
>+            if (osInfo->PreInit)
>+                osInfo->PreInit(pInfo, protocol, 0);
>+            break;
> 	case PROT_UNKNOWN:
> 	    /* Check for a builtin OS-specific protocol,
> 	     * and call its PreInit. */
>diff --git a/src/mouse.h b/src/mouse.h
>index 9f5b47e..6e63c54 100644
>--- a/src/mouse.h
>+++ b/src/mouse.h
>@@ -77,6 +77,7 @@ typedef enum {
>     PROT_BM,
>     PROT_AUTO,
>     PROT_SYSMOUSE,
>+    PROT_WSMOUSE,
>     PROT_NUMPROTOS	/* This must always be last. */
> } MouseProtocolID;
> 
>-- 
>1.7.3.5
>

Actions: View | Splinter Review

Attachments on bug 34794: 43898 | 44158 | 44192 | 44226 | 44276

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.