summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2000-09-25 21:16:16 +0000
committerjmz <jmz@FreeBSD.org>2000-09-25 21:16:16 +0000
commit6d29ad831c4888fef035c36dfe3435e4d7a105cc (patch)
tree74ddacb83e442f1c3fe7aabf37c86716cdd70aff /x11
parent58c4a715816cefaf7cc63671e8aeffae39cbe706 (diff)
downloadFreeBSD-ports-6d29ad831c4888fef035c36dfe3435e4d7a105cc.zip
FreeBSD-ports-6d29ad831c4888fef035c36dfe3435e4d7a105cc.tar.gz
This fixes the nasty problem of the mouse locking if you toggle between X
and a virtual terminal. Submitted by: Sean O'Connell <sean@stat.Duke.EDU>
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4/files/patch-k32
1 files changed, 32 insertions, 0 deletions
diff --git a/x11/XFree86-4/files/patch-k b/x11/XFree86-4/files/patch-k
new file mode 100644
index 0000000..e5308d9
--- /dev/null
+++ b/x11/XFree86-4/files/patch-k
@@ -0,0 +1,32 @@
+--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sun Jul 23 17:50:10 2000
++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sun Jul 23 17:54:22 2000
+@@ -692,10 +692,15 @@
+ pMse->protocolID = protocolID;
+ }
+ }
++#ifndef __FreeBSD__
+ memcpy(pMse->protoPara, proto[pMse->protocolID], sizeof(pMse->protoPara));
++#endif
+ if (automatic) {
+
+ if (name) {
++#ifdef __FreeBSD__
++ memcpy(pMse->protoPara, proto[pMse->protocolID], sizeof(pMse->protoPara));
++#endif
+ /* Possible protoPara overrides from SetupAuto. */
+ for (i = 0; i < sizeof(pMse->protoPara); i++)
+ if (protoPara[i] != -1)
+--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig Sat Feb 12 22:45:41 2000
++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c Sun Jul 23 17:50:10 2000
+@@ -165,7 +165,11 @@
+ mode.rate = rate > 0 ? rate : -1;
+ mode.resolution = res > 0 ? res : -1;
+ mode.accelfactor = -1;
++#ifdef __FreeBSD__
++ mode.level = 1;
++#else
+ mode.level = -1;
++#endif
+ ioctl(pInfo->fd, MOUSE_SETMODE, &mode);
+ }
+ #endif
OpenPOWER on IntegriCloud