[Commit] kdrive/linux Imakefile, 1.9, 1.10 agp.c, 1.2, 1.3 bus.c, 1.3, 1.4 keyboard.c, 1.10, 1.11 linux.c, 1.8, 1.9 mouse.c, 1.6, 1.7 ms.c, 1.2, 1.3 ps2.c, 1.7, 1.8 ts.c, 1.10, 1.11 tslib.c, 1.2, 1.3

Keith Packard commit at keithp.com
Mon Jul 7 13:13:33 PDT 2003 

Committed by: keithp

Update of /local/src/CVS/kdrive/linux
In directory home.keithp.com:/tmp/cvs-serv15771/linux

Modified Files:
	Imakefile agp.c bus.c keyboard.c linux.c mouse.c ms.c ps2.c 
	ts.c tslib.c 
Log Message:
Update RCS tags, fix keyboard hang on VT switch, fix scroll wheel mice, add -rawcoord option to not transform mice on rotate, fix mtrr to use power-of-two size, add a few vesa options

Index: Imakefile
===================================================================
RCS file: /local/src/CVS/kdrive/linux/Imakefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Imakefile	1 Nov 2002 22:27:49 -0000	1.9
+++ Imakefile	7 Jul 2003 19:12:59 -0000	1.10
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/linux/Imakefile,v 1.8 2001/10/12 06:33:09 keithp Exp $
+XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/linux/Imakefile,v 1.8 2001/10/12 06:33:09 keithp Exp $
 KDRIVE=..
 #include "../Kdrive.tmpl"
 

Index: agp.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/agp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- agp.c	12 Dec 2002 18:29:05 -0000	1.2
+++ agp.c	7 Jul 2003 19:12:59 -0000	1.3
@@ -35,7 +35,7 @@
 
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.4 2000/08/28 18:12:56 dawes Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.4 2000/08/28 18:12:56 dawes Exp $ */
 
 /*
  * Author: Pontus Lidman <pontus.lidman at nokia.com> (adaption to KDrive) and others

Index: bus.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/bus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bus.c	12 Oct 2001 06:33:10 -0000	1.3
+++ bus.c	7 Jul 2003 19:12:59 -0000	1.4
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/bus.c,v 1.2 2001/06/29 14:00:41 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/bus.c,v 1.2 2001/06/29 14:00:41 keithp Exp $
  *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that

Index: keyboard.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/keyboard.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- keyboard.c	8 Nov 2001 10:26:24 -0000	1.10
+++ keyboard.c	7 Jul 2003 19:12:59 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.9 2001/10/12 06:33:10 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.10 2001/11/08 10:26:24 keithp Exp $
  *
  * Copyright © 1999 Keith Packard
  *
@@ -397,12 +397,13 @@
 static struct termios	LinuxTermios;
 static int		LinuxKbdType;
 
-void
+int
 LinuxKeyboardEnable (int fd, void *closure)
 {
     struct termios nTty;
     unsigned char   buf[256];
     int		    n;
+    int		    flags;
 
     ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
     tcgetattr (fd, &LinuxTermios);
@@ -423,6 +424,7 @@
      */
     while ((n = read (fd, buf, sizeof (buf))) > 0)
 	;
+    return fd;
 }
 
 void

Index: linux.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/linux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- linux.c	8 Oct 2002 21:27:55 -0000	1.8
+++ linux.c	7 Jul 2003 19:12:59 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/linux.c,v 1.6 2001/07/24 21:26:17 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/linux.c,v 1.6 2001/07/24 21:26:17 keithp Exp $
  *
  * Copyright © 1999 Keith Packard
  *

Index: mouse.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/mouse.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mouse.c	2 Aug 2002 16:11:35 -0000	1.6
+++ mouse.c	7 Jul 2003 19:12:59 -0000	1.7
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/mouse.c,v 1.4 2001/12/07 02:18:19 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/mouse.c,v 1.6 2002/08/02 16:11:35 keithp Exp $
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -279,6 +279,7 @@
     Kmouse	    *km = mi->driver;
     int		    dx, dy, dz;
     unsigned long   flags;
+    unsigned long   flagsrelease = 0;
     
     flags = KD_MOUSE_DELTA;
     if (ev[0] & 4)
@@ -291,10 +292,16 @@
     if (ne > 3)
     {
 	dz = (int) (signed char) ev[3];
-	if (dz > 0)
+	if (dz < 0)
+	{
 	    flags |= KD_BUTTON_4;
-	else if (dz < 0)
+	    flagsrelease = KD_BUTTON_4;
+	}
+	else if (dz > 0)
+	{
 	    flags |= KD_BUTTON_5;
+	    flagsrelease = KD_BUTTON_5;
+	}
     }
 	
     dx = ev[1];
@@ -307,7 +314,14 @@
     if (!MouseReasonable (mi, flags, dx, dy))
 	return FALSE;
     if (km->stage == MouseWorking)
+    {
 	KdEnqueueMouseEvent (mi, flags, dx, dy);
+	if (flagsrelease)
+	{
+	    flags &= ~flagsrelease;
+	    KdEnqueueMouseEvent (mi, flags, dx, dy);
+	}
+    }
     return TRUE;
 }
 

Index: ms.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/ms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ms.c	12 Oct 2001 06:33:10 -0000	1.2
+++ ms.c	7 Jul 2003 19:12:59 -0000	1.3
@@ -20,7 +20,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"

Index: ps2.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/ps2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ps2.c	2 Aug 2002 16:11:35 -0000	1.7
+++ ps2.c	7 Jul 2003 19:12:59 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/ps2.c,v 1.6 2001/10/12 06:33:10 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ps2.c,v 1.6 2001/10/12 06:33:10 keithp Exp $
  *
  * Copyright © 1999 Keith Packard
  *

Index: ts.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/ts.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ts.c	12 Nov 2002 22:20:42 -0000	1.10
+++ ts.c	7 Jul 2003 19:12:59 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.9 2002/08/15 18:07:48 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.9 2002/08/15 18:07:48 keithp Exp $
  *
  * Derived from ps2.c by Jim Gettys
  *

Index: tslib.c
===================================================================
RCS file: /local/src/CVS/kdrive/linux/tslib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tslib.c	5 Nov 2002 05:28:06 -0000	1.2
+++ tslib.c	7 Jul 2003 19:12:59 -0000	1.3
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/tslib.c,v 1.1 2002/11/01 22:27:49 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/linux/tslib.c,v 1.1 2002/11/01 22:27:49 keithp Exp $
  * TSLIB based touchscreen driver for TinyX
  * Derived from ts.c by Keith Packard
  * Derived from ps2.c by Jim Gettys

More information about the Commit mailing list