Module Name: xsrc
Committed By: mrg
Date: Mon Nov 22 07:29:23 UTC 2010
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c
Removed Files:
xsrc/external/mit/xf86-input-mouse/dist: README.sgml
Log Message:
merge xf86-input-mouse 1.6.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-input-mouse/dist/README.sgml
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.10 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.11
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.10 Sat May 22 09:49:13 2010
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Mon Nov 22 07:29:23 2010
@@ -47,24 +47,20 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <math.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "xf86.h"
-#ifdef XINPUT
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h"
-#else
-#include "inputstr.h"
-#endif
#include "xf86Xinput.h"
#include "xf86_OSproc.h"
@@ -1555,26 +1551,14 @@
/*
* MouseCtrl --
- * Alter the control parameters for the mouse. Note that all special
- * protocol values are handled by dix.
+ * Alter the control parameters for the mouse. Note that all
+ * settings are now handled by dix.
*/
static void
MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
{
- InputInfoPtr pInfo;
- MouseDevPtr pMse;
-
- pInfo = device->public.devicePrivate;
- pMse = pInfo->private;
-
-#ifdef EXTMOUSEDEBUG
- ErrorF("MouseCtrl pMse=%p\n", pMse);
-#endif
-
- pMse->num = ctrl->num;
- pMse->den = ctrl->den;
- pMse->threshold = ctrl->threshold;
+ /* This function intentionally left blank */
}
/*
@@ -1719,7 +1703,6 @@
break;
case DEVICE_OFF:
- case DEVICE_CLOSE:
if (pInfo->fd != -1) {
xf86RemoveEnabledDevice(pInfo);
if (pMse->buffer) {
@@ -1737,6 +1720,10 @@
}
device->public.on = FALSE;
break;
+ case DEVICE_CLOSE:
+ xfree(pMse->mousePriv);
+ pMse->mousePriv = NULL;
+ break;
}
return Success;
}
