diff options
| author | jmz <jmz@FreeBSD.org> | 2000-09-30 22:13:04 +0000 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2000-09-30 22:13:04 +0000 |
| commit | 8432f2eb3db313dd4c5c6984fb5b445b52faa46a (patch) | |
| tree | 39e1ea797e1919a66e1fec369ebe55f31927a8e2 /x11/XFree86-4 | |
| parent | 58ae11bcaffbf1f0cbff3de588fbc35ee7cccc44 (diff) | |
| download | FreeBSD-ports-8432f2eb3db313dd4c5c6984fb5b445b52faa46a.zip FreeBSD-ports-8432f2eb3db313dd4c5c6984fb5b445b52faa46a.tar.gz | |
A better patch for the mouse locking problem. The previous patch broke some
of the other mouse protocols.
Submitted by: Sascha Blank <sblank@addcom.de>
Diffstat (limited to 'x11/XFree86-4')
| -rw-r--r-- | x11/XFree86-4/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-k | 73 |
2 files changed, 42 insertions, 33 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index d570c29..abc41d2 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11/XFree86-4/files/patch-k b/x11/XFree86-4/files/patch-k index e5308d9..6d0d89d 100644 --- a/x11/XFree86-4/files/patch-k +++ b/x11/XFree86-4/files/patch-k @@ -1,32 +1,41 @@ ---- 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 +*** xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jul 1 01:39:02 2000 +--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Sep 22 11:30:18 2000 +*************** +*** 584,591 **** + { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ + /* Bus Mouse */ + { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* BusMouse */ +! /* Auto */ +! { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* dummy entry */ + }; + + /* +--- 584,591 ---- + { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ + /* Bus Mouse */ + { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* BusMouse */ +! { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* Auto */ +! { 0xf8, 0x80, 0x00, 0x00, 8, 0x00, 0xff, MPF_NONE }, /* SysMouse */ + }; + + /* +*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig Sat Feb 12 21:45:41 2000 +--- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c Fri Sep 22 11:30:18 2000 +*************** +*** 165,171 **** +--- 165,179 ---- + mode.rate = rate > 0 ? rate : -1; + mode.resolution = res > 0 ? res : -1; + mode.accelfactor = -1; ++ #if defined(__FreeBSD__) ++ /* ++ * As the FreeBSD sysmouse driver defaults to protocol level 0 everytime ++ * it is opened we enforce protocol level 1 again at this point. ++ */ ++ mode.level = 1; ++ #else + mode.level = -1; ++ #endif + ioctl(pInfo->fd, MOUSE_SETMODE, &mode); + } + #endif |
