[Commit] kdrive Imakefile, 1.8, 1.9 Kdrive.tmpl, 1.4, 1.5 Xkdrive.man, 1.5, 1.6 kaa.c, 1.5, 1.6 kasync.c, 1.9, 1.10 kcmap.c, 1.5, 1.6 kcolor.c, 1.4, 1.5 kcurscol.c, 1.5, 1.6 kdrive.c, 1.29, 1.30 kdrive.h, 1.29, 1.30 kinfo.c, 1.3, 1.4 kinput.c, 1.30, 1.31 kkeymap.c, 1.2, 1.3 kkeymap.h, 1.3, 1.4 kloadmap.c, 1.2, 1.3 kmap.c, 1.10, 1.11 kmode.c, 1.8, 1.9 knoop.c, 1.2, 1.3 kpict.c, 1.3, 1.4 kshadow.c, 1.3, 1.4 ktest.c, 1.2, 1.3 kxv.c, 1.4, 1.5 kxv.h, 1.2, 1.3 vga.c, 1.4, 1.5 vga.h, 1.4, 1.5

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


Committed by: keithp

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

Modified Files:
	Imakefile Kdrive.tmpl Xkdrive.man kaa.c kasync.c kcmap.c 
	kcolor.c kcurscol.c kdrive.c kdrive.h kinfo.c kinput.c 
	kkeymap.c kkeymap.h kloadmap.c kmap.c kmode.c knoop.c kpict.c 
	kshadow.c ktest.c kxv.c kxv.h vga.c vga.h 
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/Imakefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Imakefile	29 May 2001 04:54:10 -0000	1.8
+++ Imakefile	7 Jul 2003 19:12:57 -0000	1.9
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Imakefile,v 1.7 2001/05/23 08:56:08 alanh Exp $
+XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/Imakefile,v 1.7 2001/05/23 08:56:08 alanh Exp $
 KDRIVE=.
 #include "Kdrive.tmpl"
 

Index: Kdrive.tmpl
===================================================================
RCS file: /local/src/CVS/kdrive/Kdrive.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kdrive.tmpl	29 Oct 2001 16:34:56 -0000	1.4
+++ Kdrive.tmpl	7 Jul 2003 19:12:57 -0000	1.5
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Kdrive.tmpl,v 1.3tsi Exp $
+XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/Kdrive.tmpl,v 1.3tsi Exp $
 
 #include <Server.tmpl>
 

Index: Xkdrive.man
===================================================================
RCS file: /local/src/CVS/kdrive/Xkdrive.man,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Xkdrive.man	14 Feb 2002 16:08:05 -0000	1.5
+++ Xkdrive.man	7 Jul 2003 19:12:57 -0000	1.6
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
+.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
 .\"
 .TH Xkdrive 1 __vendorversion__
 .SH NAME
@@ -73,5 +73,5 @@
 .SH SEE ALSO
 X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
 .SH AUTHORS
-The Xkdrive common core was written by Keith Packard, based on XFree86
-which, in turn, is based on the Sample Implementation of X.
+The Xkdrive common core was written by Keith Packard,
+and is based on the Sample Implementation of X.

Index: kaa.c
===================================================================
RCS file: /local/src/CVS/kdrive/kaa.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kaa.c	29 Jun 2001 13:55:53 -0000	1.5
+++ kaa.c	7 Jul 2003 19:12:57 -0000	1.6
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.4 2001/06/04 09:45:41 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.4 2001/06/04 09:45:41 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

Index: kasync.c
===================================================================
RCS file: /local/src/CVS/kdrive/kasync.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kasync.c	4 Jun 2001 09:45:41 -0000	1.9
+++ kasync.c	7 Jul 2003 19:12:57 -0000	1.10
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */
 
 #include "kdrive.h"
 

Index: kcmap.c
===================================================================
RCS file: /local/src/CVS/kdrive/kcmap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kcmap.c	22 Sep 2000 06:25:29 -0000	1.5
+++ kcmap.c	7 Jul 2003 19:12:57 -0000	1.6
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
 
 #include "kdrive.h"
 

Index: kcolor.c
===================================================================
RCS file: /local/src/CVS/kdrive/kcolor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kcolor.c	30 Mar 2001 02:15:19 -0000	1.4
+++ kcolor.c	7 Jul 2003 19:12:57 -0000	1.5
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */
 
 #include "kdrive.h"
 #include <stdio.h>

Index: kcurscol.c
===================================================================
RCS file: /local/src/CVS/kdrive/kcurscol.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kcurscol.c	15 Sep 2000 15:18:59 -0000	1.5
+++ kcurscol.c	7 Jul 2003 19:12:57 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $
  *
  * Copyright © 1999 Keith Packard
  *

Index: kdrive.c
===================================================================
RCS file: /local/src/CVS/kdrive/kdrive.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kdrive.c	31 Oct 2002 18:29:50 -0000	1.29
+++ kdrive.c	7 Jul 2003 19:12:57 -0000	1.30
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.28 2002/10/08 21:28:04 keithp Exp $ 
+ * $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $ 
  *
  * Copyright © 1999 Keith Packard
  *
@@ -50,6 +50,7 @@
 Bool                kdVideoTest;
 unsigned long       kdVideoTestTime;
 Bool		    kdEmulateMiddleButton;
+Bool		    kdRawPointerCoordinates;
 Bool		    kdDisableZaphod;
 Bool		    kdEnabled;
 int		    kdSubpixelOrder;
@@ -338,6 +339,7 @@
   ErrorF("-zaphod		Disable cursor screen switching\n");
   ErrorF("-2button	Emulate 3 button mouse\n");
   ErrorF("-3button	Disable 3 button mouse emulation\n");
+  ErrorF("-rawcoord	Don't transform pointer coordinates on rotation\n");
   ErrorF("-dumb 		Disable hardware acceleration\n");
   ErrorF("-softCursor	Force software cursor\n");
   ErrorF("-videoTest	Start the server, pause momentarily and exit\n");
@@ -562,6 +564,7 @@
     mi->name = 0;
     mi->prot = 0;
     mi->emulateMiddleButton = kdEmulateMiddleButton;
+    mi->transformCoordinates = !kdRawPointerCoordinates;
     mi->nbutton = 3;
     for (i = 0; i < KD_MAX_BUTTON; i++)
 	mi->map[i] = i + 1;
@@ -619,6 +622,10 @@
 	    mi->emulateMiddleButton = TRUE;
 	else if (!strcmp (save, "3button"))
 	    mi->emulateMiddleButton = FALSE;
+	else if (!strcmp (save, "rawcoord"))
+	    mi->transformCoordinates = FALSE;
+	else if (!strcmp (save, "transform"))
+	    mi->transformCoordinates = TRUE;
 	else
 	    UseMsg ();
     }
@@ -688,6 +695,11 @@
     if (!strcmp (argv[i], "-2button"))
     {
 	kdEmulateMiddleButton = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-rawcoord"))
+    {
+	kdRawPointerCoordinates = 1;
 	return 1;
     }
     if (!strcmp (argv[i], "-dumb"))

Index: kdrive.h
===================================================================
RCS file: /local/src/CVS/kdrive/kdrive.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kdrive.h	13 Nov 2002 16:37:39 -0000	1.29
+++ kdrive.h	7 Jul 2003 19:12:57 -0000	1.30
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.28 2002/11/05 05:28:34 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.29 2002/11/13 16:37:39 keithp Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -204,6 +204,7 @@
     unsigned char	buttonState;
     int			emulationDx, emulationDy;
     int			inputType;
+    Bool		transformCoordinates;
 } KdMouseInfo;
 
 extern KdMouseInfo	*kdMouseInfo;

Index: kinfo.c
===================================================================
RCS file: /local/src/CVS/kdrive/kinfo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kinfo.c	12 Oct 2001 06:33:07 -0000	1.3
+++ kinfo.c	7 Jul 2003 19:12:57 -0000	1.4
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */
 
 #include "kdrive.h"
 

Index: kinput.c
===================================================================
RCS file: /local/src/CVS/kdrive/kinput.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kinput.c	13 Nov 2002 16:37:39 -0000	1.30
+++ kinput.c	7 Jul 2003 19:12:57 -0000	1.31
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.29 2002/11/05 05:28:34 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */
 
 #include "kdrive.h"
 #include "inputstr.h"
@@ -146,6 +146,15 @@
 #define NOBLOCK FNDELAY
 #endif
 
+static void
+KdNonBlockFd (int fd)
+{
+    int	flags;
+    flags = fcntl (fd, F_GETFL);
+    flags |= FASYNC|NOBLOCK;
+    fcntl (fd, F_SETFL, flags);
+}
+
 void
 KdAddFd (int fd)
 {
@@ -155,9 +164,7 @@
     
     kdnFds++;
     fcntl (fd, F_SETOWN, getpid());
-    flags = fcntl (fd, F_GETFL);
-    flags |= FASYNC|NOBLOCK;
-    fcntl (fd, F_SETFL, flags);
+    KdNonBlockFd (fd);
     AddEnabledDevice (fd);
     memset (&act, '\0', sizeof act);
     act.sa_handler = KdSigio;
@@ -232,7 +239,7 @@
 void
 KdUnregisterFds (int type, Bool do_close)
 {
-    int	i;
+    int	i, j;
 
     for (i = 0; i < kdNumInputFds;)
     {
@@ -243,8 +250,8 @@
 	    if (do_close)
 		close (kdInputFds[i].fd);
 	    --kdNumInputFds;
-	    for (; i < kdNumInputFds; i++)
-		kdInputFds[i] = kdInputFds[i+1];
+	    for (j = i; j < kdNumInputFds; j++)
+		kdInputFds[j] = kdInputFds[j+1];
 	}
 	else
 	    i++;
@@ -274,6 +281,7 @@
     kdInputEnabled = TRUE;
     for (i = 0; i < kdNumInputFds; i++)
     {
+	KdNonBlockFd (kdInputFds[i].fd);
 	if (kdInputFds[i].enable)
 	    kdInputFds[i].fd = (*kdInputFds[i].enable) (kdInputFds[i].fd, kdInputFds[i].closure);
 	KdAddFd (kdInputFds[i].fd);
@@ -1361,16 +1369,32 @@
     
     if (flags & KD_MOUSE_DELTA)
     {
-	x = matrix[0][0] * rx + matrix[0][1] * ry;
-	y = matrix[1][0] * rx + matrix[1][1] * ry;
+	if (mi->transformCoordinates)
+	{
+	    x = matrix[0][0] * rx + matrix[0][1] * ry;
+	    y = matrix[1][0] * rx + matrix[1][1] * ry;
+	}
+	else
+	{
+	    x = rx;
+	    y = ry;
+	}
 	x = KdMouseAccelerate (pKdPointer, x);
 	y = KdMouseAccelerate (pKdPointer, y);
 	xE.u.keyButtonPointer.pad1 = 1;
     }
     else
     {
-	x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
-	y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
+	if (mi->transformCoordinates)
+	{
+	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
+	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
+	}
+	else
+	{
+	    x = rx;
+	    y = ry;
+	}
 	xE.u.keyButtonPointer.pad1 = 0;
     }
     xE.u.keyButtonPointer.time = ms;

Index: kkeymap.c
===================================================================
RCS file: /local/src/CVS/kdrive/kkeymap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kkeymap.c	23 Feb 2000 20:29:54 -0000	1.2
+++ kkeymap.c	7 Jul 2003 19:12:57 -0000	1.3
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */
 
 #include "kdrive.h"
 #include <X11/keysym.h>

Index: kkeymap.h
===================================================================
RCS file: /local/src/CVS/kdrive/kkeymap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kkeymap.h	26 Sep 2000 04:29:54 -0000	1.3
+++ kkeymap.h	7 Jul 2003 19:12:57 -0000	1.4
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 /*
  *  All global variables and functions pertaining to keyboard key mapping
  *  live in this header file.

Index: kloadmap.c
===================================================================
RCS file: /local/src/CVS/kdrive/kloadmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kloadmap.c	23 Feb 2000 20:29:54 -0000	1.2
+++ kloadmap.c	7 Jul 2003 19:12:57 -0000	1.3
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 
 #include "kdrive.h"
 #include "kkeymap.h"

Index: kmap.c
===================================================================
RCS file: /local/src/CVS/kdrive/kmap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kmap.c	24 Jul 2001 21:26:17 -0000	1.10
+++ kmap.c	7 Jul 2003 19:12:57 -0000	1.11
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.9 2001/06/29 13:57:45 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */
 
 #include "kdrive.h"
 
@@ -121,8 +121,12 @@
 	mtrr = open ("/proc/mtrr", 2);
     if (mtrr > 0)
     {
+	unsigned long nsize;
 	base = addr & ~((1<<22)-1);
 	bound = ((addr + size) + ((1<<22) - 1)) & ~((1<<22) - 1);
+	nsize = 1;
+	while (nsize < (bound - base))
+	    nsize <<= 1;
 	switch (mode) {
 	case KD_MAPPED_MODE_REGISTERS:
 	    type = MTRR_TYPE_UNCACHABLE;
@@ -132,7 +136,7 @@
 	    break;
 	}
 	sentry.base = base;
-	sentry.size = bound - base;
+	sentry.size = nsize;
 	sentry.type = type;
 	
 	if (ioctl (mtrr, MTRRIOC_ADD_ENTRY, &sentry) < 0)
@@ -156,8 +160,12 @@
 	mtrr = open ("/proc/mtrr", 2);
     if (mtrr > 0)
     {
+	unsigned long	nsize;
 	base = addr & ~((1<<22)-1);
 	bound = ((addr + size) + ((1<<22) - 1)) & ~((1<<22) - 1);
+	nsize = 1;
+	while (nsize < (bound - base))
+	    nsize <<= 1;
 	switch (mode) {
 	case KD_MAPPED_MODE_REGISTERS:
 	    type = MTRR_TYPE_UNCACHABLE;
@@ -167,7 +175,7 @@
 	    break;
 	}
 	sentry.base = base;
-	sentry.size = bound - base;
+	sentry.size = nsize;
 	sentry.type = type;
 	
 	if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0)

Index: kmode.c
===================================================================
RCS file: /local/src/CVS/kdrive/kmode.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kmode.c	18 Oct 2002 06:08:10 -0000	1.8
+++ kmode.c	7 Jul 2003 19:12:57 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.7 2002/10/14 18:01:40 keithp Exp $
+ * $RCSId: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.7 2002/10/14 18:01:40 keithp Exp $
  *
  * Copyright 1999 SuSE, Inc.
  *

Index: knoop.c
===================================================================
RCS file: /local/src/CVS/kdrive/knoop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- knoop.c	23 Feb 2000 20:29:55 -0000	1.2
+++ knoop.c	7 Jul 2003 19:12:57 -0000	1.3
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/knoop.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/knoop.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 
 /*
  * GC ops that don't do anything

Index: kpict.c
===================================================================
RCS file: /local/src/CVS/kdrive/kpict.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kpict.c	15 Sep 2000 15:19:00 -0000	1.3
+++ kpict.c	7 Jul 2003 19:12:57 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * $XFree86$
+ * $RCSId: $
  *
  * Copyright © 1999 Keith Packard
  *

Index: kshadow.c
===================================================================
RCS file: /local/src/CVS/kdrive/kshadow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kshadow.c	27 Sep 2000 20:47:37 -0000	1.3
+++ kshadow.c	7 Jul 2003 19:12:57 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * $XFree86$
+ * $RCSId: $
  *
  * Copyright © 1999 Keith Packard
  *

Index: ktest.c
===================================================================
RCS file: /local/src/CVS/kdrive/ktest.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktest.c	23 Feb 2000 20:29:55 -0000	1.2
+++ ktest.c	7 Jul 2003 19:12:57 -0000	1.3
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 
 #include "kdrive.h"
 

Index: kxv.c
===================================================================
RCS file: /local/src/CVS/kdrive/kxv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kxv.c	21 Sep 2001 21:58:34 -0000	1.4
+++ kxv.c	7 Jul 2003 19:12:57 -0000	1.5
@@ -35,7 +35,7 @@
 
 */
 
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */
 
 #include "kdrive.h"
 

Index: kxv.h
===================================================================
RCS file: /local/src/CVS/kdrive/kxv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kxv.h	20 Jul 2001 19:35:29 -0000	1.2
+++ kxv.h	7 Jul 2003 19:12:57 -0000	1.3
@@ -35,7 +35,7 @@
 
 */
 
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kxv.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
 
 #ifndef _XVDIX_H_
 #define _XVDIX_H_

Index: vga.c
===================================================================
RCS file: /local/src/CVS/kdrive/vga.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vga.c	24 May 2000 23:57:56 -0000	1.4
+++ vga.c	7 Jul 2003 19:12:57 -0000	1.5
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */
 
 #include "vga.h"
 #include <stdio.h>

Index: vga.h
===================================================================
RCS file: /local/src/CVS/kdrive/vga.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vga.h	24 May 2000 23:57:56 -0000	1.4
+++ vga.h	7 Jul 2003 19:12:57 -0000	1.5
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.h,v 1.2 1999/12/30 03:03:07 robin Exp $ */
+/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.h,v 1.2 1999/12/30 03:03:07 robin Exp $ */
 
 #ifndef _VGA_H_
 #define _VGA_H_




More information about the Commit mailing list