[PATCH mouse 23/23] Remove write-only field mouseFlags.

Peter Hutterer peter.hutterer at who-t.net
Sun Oct 24 23:25:31 PDT 2010


The flags were used to store ClearDTS and ClearRTR, but those options only
resulted in log messages.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/mouse.c |   23 +----------------------
 src/mouse.h |    2 --
 2 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/src/mouse.c b/src/mouse.c
index 19ad8bc..fb9ccc8 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -660,29 +660,8 @@ static void
 MouseSerialOptions(InputInfoPtr pInfo)
 {
     MouseDevPtr  pMse = pInfo->private;
-    Bool clearDTR, clearRTS;
-    
-    
+
     pMse->baudRate = xf86SetIntOption(pInfo->options, "BaudRate", 0);
-    if ((clearDTR = xf86SetBoolOption(pInfo->options, "ClearDTR",FALSE)))
-	pMse->mouseFlags |= MF_CLEAR_DTR;
-	
-    
-    if ((clearRTS = xf86SetBoolOption(pInfo->options, "ClearRTS",FALSE)))
-	pMse->mouseFlags |= MF_CLEAR_RTS;
-	
-    if (clearDTR || clearRTS) {
-	xf86Msg(X_CONFIG, "%s: ", pInfo->name);
-	if (clearDTR) {
-	    xf86ErrorF("ClearDTR");
-	    if (clearRTS)
-		xf86ErrorF(", ");
-	}
-	if (clearRTS) {
-	    xf86ErrorF("ClearRTS");
-	}
-	xf86ErrorF("\n");
-    }
 }
 
 static MouseProtocolID
diff --git a/src/mouse.h b/src/mouse.h
index 51741fc..8c02ba1 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -211,8 +211,6 @@ typedef struct _MouseDevRec {
     Bool                flipXY;
     int                 invX;
     int                 invY;
-    int			mouseFlags;	/* Flags to Clear after opening
-					 * mouse dev */
     int			resolution;
     int			negativeZ;	/* button mask */
     int			positiveZ;	/* button mask */
-- 
1.7.2.3



More information about the xorg-devel mailing list