diff options
| author | Keith Packard <keithp@keithp.com> | 2003-07-07 19:13:03 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-07-07 19:13:03 +0000 |
| commit | 283a7f32c449b1970e5a484351f8396a8afd99da (patch) | |
| tree | ab6df42d57b9d8dfd49203a18e607f90ff925935 | |
| parent | 804b89284665f19e2c92a07fadc72c25fbb3f5d9 (diff) | |
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
137 files changed, 332 insertions, 205 deletions
diff --git a/hw/kdrive/Imakefile b/hw/kdrive/Imakefile index ad1050092..2ff182c38 100644 --- a/hw/kdrive/Imakefile +++ b/hw/kdrive/Imakefile @@ -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" diff --git a/hw/kdrive/Kdrive.tmpl b/hw/kdrive/Kdrive.tmpl index f174049f6..e259b59a2 100644 --- a/hw/kdrive/Kdrive.tmpl +++ b/hw/kdrive/Kdrive.tmpl @@ -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> diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man index 26bb28c55..b4f1a977d 100644 --- a/hw/kdrive/Xkdrive.man +++ b/hw/kdrive/Xkdrive.man @@ -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 @@ disable emulation of a middle mouse button by chording. .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. diff --git a/hw/kdrive/chips/Imakefile b/hw/kdrive/chips/Imakefile index d2a06d265..72970d837 100644 --- a/hw/kdrive/chips/Imakefile +++ b/hw/kdrive/chips/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/chips/Imakefile,v 1.6 2000/10/20 00:19:51 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/chips/Imakefile,v 1.6 2000/10/20 00:19:51 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c index 3ab05bf86..faebaba32 100644 --- a/hw/kdrive/chips/chips.c +++ b/hw/kdrive/chips/chips.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */ #include "chips.h" #include <sys/io.h> diff --git a/hw/kdrive/chips/chips.h b/hw/kdrive/chips/chips.h index 82d081e7d..869a0717c 100644 --- a/hw/kdrive/chips/chips.h +++ b/hw/kdrive/chips/chips.h @@ -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/chips/chips.h,v 1.9 2000/11/29 08:42:25 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chips.h,v 1.9 2000/11/29 08:42:25 keithp Exp $ */ #ifndef _CHIPS_H_ #define _CHIPS_H_ diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c index f23b9fa55..fb860c382 100644 --- a/hw/kdrive/chips/chipsdraw.c +++ b/hw/kdrive/chips/chipsdraw.c @@ -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/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #include "chips.h" diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c index 52dac0d97..73c284942 100644 --- a/hw/kdrive/chips/chipsstub.c +++ b/hw/kdrive/chips/chipsstub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */ #include "chips.h" diff --git a/hw/kdrive/fbdev/Imakefile b/hw/kdrive/fbdev/Imakefile index 9e1ccde93..6f9650937 100644 --- a/hw/kdrive/fbdev/Imakefile +++ b/hw/kdrive/fbdev/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/Imakefile,v 1.4 2001/05/23 08:56:08 alanh Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Imakefile,v 1.4 2001/05/23 08:56:08 alanh Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/fbdev/Xfbdev.man b/hw/kdrive/fbdev/Xfbdev.man index f1020a5c1..bfdae168f 100644 --- a/hw/kdrive/fbdev/Xfbdev.man +++ b/hw/kdrive/fbdev/Xfbdev.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $ +.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $ .\" .TH Xfbdev 1 __vendorversion__ .SH NAME diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 7393ed8ac..c1c30fe1c 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -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/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */ #include "fbdev.h" diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h index c821bc140..a88111754 100644 --- a/hw/kdrive/fbdev/fbdev.h +++ b/hw/kdrive/fbdev/fbdev.h @@ -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/fbdev/fbdev.h,v 1.11 2001/06/03 21:52:45 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.11 2001/06/03 21:52:45 keithp Exp $ */ #ifndef _FBDEV_H_ #define _FBDEV_H_ diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index 7d70e6eae..8ef7671c3 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -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/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */ #include <fbdev.h> diff --git a/hw/kdrive/i810/Imakefile b/hw/kdrive/i810/Imakefile index d967f197b..32850275d 100644 --- a/hw/kdrive/i810/Imakefile +++ b/hw/kdrive/i810/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/i810/Imakefile,v 1.6 2000/10/20 00:19:51 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/i810/Imakefile,v 1.6 2000/10/20 00:19:51 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c index 050c2cd64..59dfa257c 100644 --- a/hw/kdrive/i810/i810.c +++ b/hw/kdrive/i810/i810.c @@ -32,7 +32,7 @@ of the copyright holder. X Window System is a trademark of The Open Group */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810.c,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810.c,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ /* * i810.c - KDrive driver for the i810 chipset diff --git a/hw/kdrive/i810/i810.h b/hw/kdrive/i810/i810.h index bd4ff9711..bb8091fe4 100644 --- a/hw/kdrive/i810/i810.h +++ b/hw/kdrive/i810/i810.h @@ -31,7 +31,7 @@ of the copyright holder. X Window System is a trademark of The Open Group */ -/* $XFree86$ */ +/* $RCSId: $ */ /* * Author: diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c index e58571087..7b33fa227 100644 --- a/hw/kdrive/i810/i810_cursor.c +++ b/hw/kdrive/i810/i810_cursor.c @@ -60,7 +60,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */ /* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */ diff --git a/hw/kdrive/i810/i810_reg.h b/hw/kdrive/i810/i810_reg.h index f1cc1ddf5..e6648a1de 100644 --- a/hw/kdrive/i810/i810_reg.h +++ b/hw/kdrive/i810/i810_reg.h @@ -57,7 +57,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ /* * Authors: diff --git a/hw/kdrive/i810/i810_video.c b/hw/kdrive/i810/i810_video.c index eb9d49d5b..a7b0ae824 100644 --- a/hw/kdrive/i810/i810_video.c +++ b/hw/kdrive/i810/i810_video.c @@ -58,8 +58,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_video.c,v 1.1tsi Exp $ */ - /* * i810_video.c: i810 KDrive Xv driver. * Based on the XFree86 i810 Xv driver by Jonathan Bian. diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c index dbdf58e23..4ab4142ad 100644 --- a/hw/kdrive/i810/i810stub.c +++ b/hw/kdrive/i810/i810stub.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $RCSId: $ */ /* COPYRIGHT AND PERMISSION NOTICE Copyright (c) 2000, 2001 Nokia Home Communications diff --git a/hw/kdrive/igs/Imakefile b/hw/kdrive/igs/Imakefile index f282225ab..2214ee5ba 100644 --- a/hw/kdrive/igs/Imakefile +++ b/hw/kdrive/igs/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.2 2000/05/24 23:52:47 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.2 2000/05/24 23:52:47 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c index 99ad6ec74..cdefe7551 100644 --- a/hw/kdrive/igs/igs.c +++ b/hw/kdrive/igs/igs.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $ * * Copyright © 1999 SuSE, Inc. * diff --git a/hw/kdrive/igs/igs.h b/hw/kdrive/igs/igs.h index 86f65d9d6..264425022 100644 --- a/hw/kdrive/igs/igs.h +++ b/hw/kdrive/igs/igs.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ * * Copyright © 1999 SuSE, Inc. * diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c index b6cc93538..fa464384c 100644 --- a/hw/kdrive/igs/igscmap.c +++ b/hw/kdrive/igs/igscmap.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c index 9c330b80f..82fc1a166 100644 --- a/hw/kdrive/igs/igscurs.c +++ b/hw/kdrive/igs/igscurs.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c index 7ac19393b..547e61791 100644 --- a/hw/kdrive/igs/igsdraw.c +++ b/hw/kdrive/igs/igsdraw.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c,v 1.1 2000/05/06 22:17:43 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c,v 1.1 2000/05/06 22:17:43 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igsdraw.h b/hw/kdrive/igs/igsdraw.h index 7b561fd55..c969826b1 100644 --- a/hw/kdrive/igs/igsdraw.h +++ b/hw/kdrive/igs/igsdraw.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c index 7e4e095d0..1f4e6de8a 100644 --- a/hw/kdrive/igs/igsreg.c +++ b/hw/kdrive/igs/igsreg.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igsreg.h b/hw/kdrive/igs/igsreg.h index 3da489c2a..ddccd8907 100644 --- a/hw/kdrive/igs/igsreg.h +++ b/hw/kdrive/igs/igsreg.h @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c index 9d5949aa3..a25257ffc 100644 --- a/hw/kdrive/igs/igsstub.c +++ b/hw/kdrive/igs/igsstub.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsstub.c,v 1.2 2000/05/24 23:52:48 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsstub.c,v 1.2 2000/05/24 23:52:48 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/hw/kdrive/ipaq/Imakefile b/hw/kdrive/ipaq/Imakefile index 1c09a15a0..9658ea7e5 100644 --- a/hw/kdrive/ipaq/Imakefile +++ b/hw/kdrive/ipaq/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86$ +XCOMM $RCSId: $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c index 9d9b213b4..d93d38228 100644 --- a/hw/kdrive/ipaq/ipaq.c +++ b/hw/kdrive/ipaq/ipaq.c @@ -22,7 +22,7 @@ * Adapted from ts300.c by Alan Hourihane <alanh@fairlite.demon.co.uk> * For the Compaq IPAQ handheld, with the HP VGA Out Card (F1252A). */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */ #include "pcmcia.h" diff --git a/hw/kdrive/itsy/Imakefile b/hw/kdrive/itsy/Imakefile index f81d705e2..1c646af6f 100644 --- a/hw/kdrive/itsy/Imakefile +++ b/hw/kdrive/itsy/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c index 3bf84af48..45553e55d 100644 --- a/hw/kdrive/itsy/itsy.c +++ b/hw/kdrive/itsy/itsy.c @@ -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/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */ #include "itsy.h" diff --git a/hw/kdrive/itsy/itsy.h b/hw/kdrive/itsy/itsy.h index 689b6b39c..3c1fdd79e 100644 --- a/hw/kdrive/itsy/itsy.h +++ b/hw/kdrive/itsy/itsy.h @@ -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/itsy/itsy.h,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.h,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #include "kdrive.h" #include <stdio.h> diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c index c686b489c..23cdf0a69 100644 --- a/hw/kdrive/itsy/kbd.c +++ b/hw/kdrive/itsy/kbd.c @@ -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/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #include "itsy.h" #include "kkeymap.h" diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c index da066fc95..c3548ba10 100644 --- a/hw/kdrive/itsy/ts.c +++ b/hw/kdrive/itsy/ts.c @@ -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/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */ #define NEED_EVENTS #include "itsy.h" diff --git a/hw/kdrive/linux/Imakefile b/hw/kdrive/linux/Imakefile index 744b8c21d..c4fc2642f 100644 --- a/hw/kdrive/linux/Imakefile +++ b/hw/kdrive/linux/Imakefile @@ -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" diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c index dc31eac96..b84743a78 100644 --- a/hw/kdrive/linux/agp.c +++ b/hw/kdrive/linux/agp.c @@ -35,7 +35,7 @@ of the copyright holder. */ -/* $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@nokia.com> (adaption to KDrive) and others diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c index 58afc1f8c..20161c8c5 100644 --- a/hw/kdrive/linux/bus.c +++ b/hw/kdrive/linux/bus.c @@ -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 diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c index ff73158bb..14fdd1b7d 100644 --- a/hw/kdrive/linux/keyboard.c +++ b/hw/kdrive/linux/keyboard.c @@ -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 int LinuxKbdTrans; 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 @@ LinuxKeyboardEnable (int fd, void *closure) */ while ((n = read (fd, buf, sizeof (buf))) > 0) ; + return fd; } void diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c index 03ae22fee..fd649c117 100644 --- a/hw/kdrive/linux/linux.c +++ b/hw/kdrive/linux/linux.c @@ -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 * diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c index b034014a4..61a255646 100644 --- a/hw/kdrive/linux/mouse.c +++ b/hw/kdrive/linux/mouse.c @@ -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 @@ static Bool ps2Parse (KdMouseInfo *mi, unsigned char *ev, int ne) 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 @@ static Bool ps2Parse (KdMouseInfo *mi, unsigned char *ev, int ne) 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 @@ static Bool ps2Parse (KdMouseInfo *mi, unsigned char *ev, int ne) 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; } diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c index 762e2118b..80f131124 100644 --- a/hw/kdrive/linux/ms.c +++ b/hw/kdrive/linux/ms.c @@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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" diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c index d5e83a8cf..856d41a06 100644 --- a/hw/kdrive/linux/ps2.c +++ b/hw/kdrive/linux/ps2.c @@ -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 * diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index f7e6ad4cc..1fa12eddd 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -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 * diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c index 30413c0b4..3f491b285 100644 --- a/hw/kdrive/linux/tslib.c +++ b/hw/kdrive/linux/tslib.c @@ -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 diff --git a/hw/kdrive/mach64/Imakefile b/hw/kdrive/mach64/Imakefile index 103bfb887..70f0cdf82 100644 --- a/hw/kdrive/mach64/Imakefile +++ b/hw/kdrive/mach64/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/mach64/Imakefile,v 1.1 2001/06/03 18:48:19 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/mach64/Imakefile,v 1.1 2001/06/03 18:48:19 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c index ae60037a0..4971949c5 100644 --- a/hw/kdrive/mach64/mach64.c +++ b/hw/kdrive/mach64/mach64.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */ #include "mach64.h" #include <sys/io.h> diff --git a/hw/kdrive/mach64/mach64.h b/hw/kdrive/mach64/mach64.h index e33250604..3546e50b3 100644 --- a/hw/kdrive/mach64/mach64.h +++ b/hw/kdrive/mach64/mach64.h @@ -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/mach64/mach64.h,v 1.5 2001/06/23 03:41:24 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.h,v 1.5 2001/06/23 03:41:24 keithp Exp $ */ #ifndef _MACH64_H_ #define _MACH64_H_ diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c index d34b38bf6..b77a7d00b 100644 --- a/hw/kdrive/mach64/mach64curs.c +++ b/hw/kdrive/mach64/mach64curs.c @@ -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/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ #include "trident.h" #include "cursorstr.h" diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c index 272c5da95..54474f5e1 100644 --- a/hw/kdrive/mach64/mach64draw.c +++ b/hw/kdrive/mach64/mach64draw.c @@ -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/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */ #include "mach64.h" #include "mach64draw.h" diff --git a/hw/kdrive/mach64/mach64draw.h b/hw/kdrive/mach64/mach64draw.h index 185d6b86c..b7053ae49 100644 --- a/hw/kdrive/mach64/mach64draw.h +++ b/hw/kdrive/mach64/mach64draw.h @@ -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/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */ #ifndef _TRIDENTDRAW_H_ #define _TRIDENTDRAW_H_ diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c index e7d345bfa..46ea0ab08 100644 --- a/hw/kdrive/mach64/mach64stub.c +++ b/hw/kdrive/mach64/mach64stub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */ #include "mach64.h" diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c index b3cfa22c5..2e2023bf9 100644 --- a/hw/kdrive/mach64/mach64video.c +++ b/hw/kdrive/mach64/mach64video.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */ #include "mach64.h" #include "Xv.h" diff --git a/hw/kdrive/pcmcia/Imakefile b/hw/kdrive/pcmcia/Imakefile index d5b6b1bb0..29da5c418 100644 --- a/hw/kdrive/pcmcia/Imakefile +++ b/hw/kdrive/pcmcia/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86$ +XCOMM $RCSId: $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/pcmcia/modes.h b/hw/kdrive/pcmcia/modes.h index 34c7f653a..9087e9e74 100644 --- a/hw/kdrive/pcmcia/modes.h +++ b/hw/kdrive/pcmcia/modes.h @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86$ */ +/* $RCSId: $ */ #define V_NHSYNC 0x01 #define V_NVSYNC 0x02 diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c index d7317a2d1..999f93910 100644 --- a/hw/kdrive/pcmcia/pcmcia.c +++ b/hw/kdrive/pcmcia/pcmcia.c @@ -27,7 +27,7 @@ * * Tested running under a Compaq IPAQ Pocket PC running Linux */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */ #include "pcmcia.h" #define extern diff --git a/hw/kdrive/pcmcia/pcmcia.h b/hw/kdrive/pcmcia/pcmcia.h index f00fbbfea..cb4d13a6c 100644 --- a/hw/kdrive/pcmcia/pcmcia.h +++ b/hw/kdrive/pcmcia/pcmcia.h @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.h,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.h,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifndef _PCMCIA_H_ #define _PCMCIA_H_ diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c index 38612ae32..184d9c753 100644 --- a/hw/kdrive/pcmcia/pcmciacurs.c +++ b/hw/kdrive/pcmcia/pcmciacurs.c @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86$ */ +/* $RCSId: $ */ #include "pcmcia.h" #include "cursorstr.h" diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c index f4ee8e5f0..a91c31e50 100644 --- a/hw/kdrive/pcmcia/pcmciarotate.c +++ b/hw/kdrive/pcmcia/pcmciarotate.c @@ -1,7 +1,7 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.3 2001/07/21 04:13:26 keithp Exp $ + * $RCSId: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.3 2001/07/21 04:13:26 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 diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c index f41516451..c84b7a6c0 100644 --- a/hw/kdrive/pcmcia/pcmciashadow.c +++ b/hw/kdrive/pcmcia/pcmciashadow.c @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c index af05b4a6a..b74a9ccdd 100644 --- a/hw/kdrive/pcmcia/pcmciastub.c +++ b/hw/kdrive/pcmcia/pcmciastub.c @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #include "pcmcia.h" diff --git a/hw/kdrive/savage/Imakefile b/hw/kdrive/savage/Imakefile index ebbbbaa50..4d7577900 100644 --- a/hw/kdrive/savage/Imakefile +++ b/hw/kdrive/savage/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c index b3a78de3b..6776d69ba 100644 --- a/hw/kdrive/savage/s3.c +++ b/hw/kdrive/savage/s3.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */ #include "s3.h" diff --git a/hw/kdrive/savage/s3.h b/hw/kdrive/savage/s3.h index 148088181..86e1863b4 100644 --- a/hw/kdrive/savage/s3.h +++ b/hw/kdrive/savage/s3.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ #ifndef _S3_H_ #define _S3_H_ diff --git a/hw/kdrive/savage/s3.nick b/hw/kdrive/savage/s3.nick index 500b03d7b..8f6791f87 100644 --- a/hw/kdrive/savage/s3.nick +++ b/hw/kdrive/savage/s3.nick @@ -1,4 +1,4 @@ -/* $XFree86: $ */ +/* $RCSId: $ */ global f_ref = 14318000; diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c index d62762bee..99c466dce 100644 --- a/hw/kdrive/savage/s3clock.c +++ b/hw/kdrive/savage/s3clock.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */ #include "s3.h" diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c index c7061df7f..a61e3d1fc 100644 --- a/hw/kdrive/savage/s3cmap.c +++ b/hw/kdrive/savage/s3cmap.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ #include "s3.h" diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c index 1faa6d8c0..67b0cf2b2 100644 --- a/hw/kdrive/savage/s3curs.c +++ b/hw/kdrive/savage/s3curs.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */ #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c index 802e63870..b33126004 100644 --- a/hw/kdrive/savage/s3draw.c +++ b/hw/kdrive/savage/s3draw.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */ #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3draw.h b/hw/kdrive/savage/s3draw.h index 269dfe6b3..a95b53b12 100644 --- a/hw/kdrive/savage/s3draw.h +++ b/hw/kdrive/savage/s3draw.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.4 2000/05/06 22:17:47 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.4 2000/05/06 22:17:47 keithp Exp $ */ #ifndef _S3DRAW_H_ #define _S3DRAW_H_ diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c index 7c7148123..e631ec487 100644 --- a/hw/kdrive/savage/s3gc.c +++ b/hw/kdrive/savage/s3gc.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */ #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c index b2cb7a377..078093786 100644 --- a/hw/kdrive/savage/s3reg.c +++ b/hw/kdrive/savage/s3reg.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */ #include "s3reg.h" diff --git a/hw/kdrive/savage/s3reg.h b/hw/kdrive/savage/s3reg.h index aec76e8b3..9b3c5447b 100644 --- a/hw/kdrive/savage/s3reg.h +++ b/hw/kdrive/savage/s3reg.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ #ifndef _S3REG_H_ #define _S3REG_H_ diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c index cdba5ee44..bc9bfaeb6 100644 --- a/hw/kdrive/savage/s3rtst.c +++ b/hw/kdrive/savage/s3rtst.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */ #include <stdio.h> #include "s3reg.h" diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c index 90ade29c2..2bf8d76ff 100644 --- a/hw/kdrive/savage/s3stub.c +++ b/hw/kdrive/savage/s3stub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ #include "s3.h" diff --git a/hw/kdrive/sis530/Imakefile b/hw/kdrive/sis530/Imakefile index aa0da2eb4..08ac126cc 100644 --- a/hw/kdrive/sis530/Imakefile +++ b/hw/kdrive/sis530/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c index 6024fd0df..b57295f34 100644 --- a/hw/kdrive/sis530/sis.c +++ b/hw/kdrive/sis530/sis.c @@ -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/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ #include "sis.h" diff --git a/hw/kdrive/sis530/sis.h b/hw/kdrive/sis530/sis.h index f900ff0ad..2a39d0ba2 100644 --- a/hw/kdrive/sis530/sis.h +++ b/hw/kdrive/sis530/sis.h @@ -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/sis530/sis.h,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.h,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ #ifndef _SIS_H_ #define _SIS_H_ diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c index 2e5b2c2b6..dd7ff5393 100644 --- a/hw/kdrive/sis530/sisclock.c +++ b/hw/kdrive/sis530/sisclock.c @@ -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/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #include "sis.h" #include <stdio.h> diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c index 28b218273..cc971f969 100644 --- a/hw/kdrive/sis530/siscmap.c +++ b/hw/kdrive/sis530/siscmap.c @@ -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/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #include "sis.h" diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c index 14672e752..9ca41b6e7 100644 --- a/hw/kdrive/sis530/siscurs.c +++ b/hw/kdrive/sis530/siscurs.c @@ -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/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #include "sis.h" #include "cursorstr.h" diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c index 09dbf8c13..50dbab9ce 100644 --- a/hw/kdrive/sis530/sisdraw.c +++ b/hw/kdrive/sis530/sisdraw.c @@ -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/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */ #include "sis.h" #include "sisdraw.h" diff --git a/hw/kdrive/sis530/sisdraw.h b/hw/kdrive/sis530/sisdraw.h index 0207f0659..4bf67b2ac 100644 --- a/hw/kdrive/sis530/sisdraw.h +++ b/hw/kdrive/sis530/sisdraw.h @@ -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/sis530/sisdraw.h,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.h,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifndef _SISDRAW_H_ #define _SISDRAW_H_ diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c index 860c0e3ed..7d0eea6db 100644 --- a/hw/kdrive/sis530/sisio.c +++ b/hw/kdrive/sis530/sisio.c @@ -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/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */ #ifdef linux #define extern diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c index 323e5dcce..60750abdf 100644 --- a/hw/kdrive/sis530/sisstub.c +++ b/hw/kdrive/sis530/sisstub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */ #include "sis.h" diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index 3766b58bc..1ebe58078 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -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 diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c index 04542ba8d..65a18e88d 100644 --- a/hw/kdrive/src/kasync.c +++ b/hw/kdrive/src/kasync.c @@ -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" diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c index 742c34ace..9e3cf710a 100644 --- a/hw/kdrive/src/kcmap.c +++ b/hw/kdrive/src/kcmap.c @@ -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" diff --git a/hw/kdrive/src/kcolor.c b/hw/kdrive/src/kcolor.c index e464b413f..2fdeca127 100644 --- a/hw/kdrive/src/kcolor.c +++ b/hw/kdrive/src/kcolor.c @@ -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> diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c index 54cbc549a..1900f235e 100644 --- a/hw/kdrive/src/kcurscol.c +++ b/hw/kdrive/src/kcurscol.c @@ -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 * diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 70c69152d..4fc48bd67 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -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 @@ unsigned long kdGeneration; Bool kdVideoTest; unsigned long kdVideoTestTime; Bool kdEmulateMiddleButton; +Bool kdRawPointerCoordinates; Bool kdDisableZaphod; Bool kdEnabled; int kdSubpixelOrder; @@ -338,6 +339,7 @@ ddxUseMsg() 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 @@ KdParseMouse (char *arg) 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 @@ KdParseMouse (char *arg) 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 (); } @@ -690,6 +697,11 @@ KdProcessArgument (int argc, char **argv, int i) kdEmulateMiddleButton = TRUE; return 1; } + if (!strcmp (argv[i], "-rawcoord")) + { + kdRawPointerCoordinates = 1; + return 1; + } if (!strcmp (argv[i], "-dumb")) { kdDumbDriver = TRUE; diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index c24b2e765..4a54140ab 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -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 @@ typedef struct _KdMouseInfo { unsigned char buttonState; int emulationDx, emulationDy; int inputType; + Bool transformCoordinates; } KdMouseInfo; extern KdMouseInfo *kdMouseInfo; diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 7e245ebbb..aaf4e6f90 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -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" diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 0378f630b..692fac5d5 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -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 @@ static int kdnFds; #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 @@ KdAddFd (int fd) 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 @@ KdRegisterFdEnableDisable (int fd, void KdUnregisterFds (int type, Bool do_close) { - int i; + int i, j; for (i = 0; i < kdNumInputFds;) { @@ -243,8 +250,8 @@ KdUnregisterFds (int type, Bool do_close) 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 @@ KdEnableInput (void) 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 @@ KdEnqueueMouseEvent(KdMouseInfo *mi, unsigned long flags, int rx, int ry) 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; diff --git a/hw/kdrive/src/kkeymap.c b/hw/kdrive/src/kkeymap.c index 3104ac2ce..03724e490 100644 --- a/hw/kdrive/src/kkeymap.c +++ b/hw/kdrive/src/kkeymap.c @@ -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> diff --git a/hw/kdrive/src/kkeymap.h b/hw/kdrive/src/kkeymap.h index 51ab2b6a6..ccc5e86f8 100644 --- a/hw/kdrive/src/kkeymap.h +++ b/hw/kdrive/src/kkeymap.h @@ -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. diff --git a/hw/kdrive/src/kloadmap.c b/hw/kdrive/src/kloadmap.c index e72a00af8..6173b27c1 100644 --- a/hw/kdrive/src/kloadmap.c +++ b/hw/kdrive/src/kloadmap.c @@ -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" diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c index 9f1f0df2e..4b147a946 100644 --- a/hw/kdrive/src/kmap.c +++ b/hw/kdrive/src/kmap.c @@ -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 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode) 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 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode) 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 @@ KdResetMappedMode (CARD32 addr, CARD32 size, int mode) 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 @@ KdResetMappedMode (CARD32 addr, CARD32 size, int mode) break; } sentry.base = base; - sentry.size = bound - base; + sentry.size = nsize; sentry.type = type; if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0) diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c index 7006ca4b3..e354c55fd 100644 --- a/hw/kdrive/src/kmode.c +++ b/hw/kdrive/src/kmode.c @@ -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. * diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c index ecca71596..28860c99a 100644 --- a/hw/kdrive/src/knoop.c +++ b/hw/kdrive/src/knoop.c @@ -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 diff --git a/hw/kdrive/src/kpict.c b/hw/kdrive/src/kpict.c index c65929cb4..523b78b9c 100644 --- a/hw/kdrive/src/kpict.c +++ b/hw/kdrive/src/kpict.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 1999 Keith Packard * diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 2a26cef57..009c3462f 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $RCSId: $ * * Copyright © 1999 Keith Packard * diff --git a/hw/kdrive/src/ktest.c b/hw/kdrive/src/ktest.c index 7bbedb8e3..8a3eaa20f 100644 --- a/hw/kdrive/src/ktest.c +++ b/hw/kdrive/src/ktest.c @@ -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" diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index c2c6e575e..dadce9466 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -35,7 +35,7 @@ of the copyright holder. */ -/* $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" diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h index 0dc8ca2d2..1e8980c06 100644 --- a/hw/kdrive/src/kxv.h +++ b/hw/kdrive/src/kxv.h @@ -35,7 +35,7 @@ of the copyright holder. */ -/* $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_ diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c index 77d6c2ac4..e826fbc4b 100644 --- a/hw/kdrive/src/vga.c +++ b/hw/kdrive/src/vga.c @@ -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> diff --git a/hw/kdrive/src/vga.h b/hw/kdrive/src/vga.h index b224deb7f..2123257d5 100644 --- a/hw/kdrive/src/vga.h +++ b/hw/kdrive/src/vga.h @@ -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_ diff --git a/hw/kdrive/trident/Imakefile b/hw/kdrive/trident/Imakefile index 1f881a49d..0dff5e91b 100644 --- a/hw/kdrive/trident/Imakefile +++ b/hw/kdrive/trident/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/trident/Imakefile,v 1.5 2000/09/19 23:49:55 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/trident/Imakefile,v 1.5 2000/09/19 23:49:55 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c index 124757cdb..6215b035c 100644 --- a/hw/kdrive/trident/trident.c +++ b/hw/kdrive/trident/trident.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */ #include "trident.h" #include <sys/io.h> diff --git a/hw/kdrive/trident/trident.h b/hw/kdrive/trident/trident.h index 701994d7d..0b0d8cb48 100644 --- a/hw/kdrive/trident/trident.h +++ b/hw/kdrive/trident/trident.h @@ -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/trident/trident.h,v 1.8 2000/10/20 00:19:51 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.h,v 1.8 2000/10/20 00:19:51 keithp Exp $ */ #ifndef _TRIDENT_H_ #define _TRIDENT_H_ diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c index 6941778ea..40ac16d52 100644 --- a/hw/kdrive/trident/tridentcurs.c +++ b/hw/kdrive/trident/tridentcurs.c @@ -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/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */ #include "trident.h" #include "cursorstr.h" diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c index 9cfabda51..49513d6e4 100644 --- a/hw/kdrive/trident/tridentdraw.c +++ b/hw/kdrive/trident/tridentdraw.c @@ -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/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #include "trident.h" #include "tridentdraw.h" diff --git a/hw/kdrive/trident/tridentdraw.h b/hw/kdrive/trident/tridentdraw.h index 8a1817a39..ec09167a8 100644 --- a/hw/kdrive/trident/tridentdraw.h +++ b/hw/kdrive/trident/tridentdraw.h @@ -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/trident/tridentdraw.h,v 1.2 1999/12/30 03:03:18 robin Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.2 1999/12/30 03:03:18 robin Exp $ */ #ifndef _TRIDENTDRAW_H_ #define _TRIDENTDRAW_H_ diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c index b725670cb..9fce1fbbe 100644 --- a/hw/kdrive/trident/tridentstub.c +++ b/hw/kdrive/trident/tridentstub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */ #include "trident.h" diff --git a/hw/kdrive/trio/Imakefile b/hw/kdrive/trio/Imakefile index 5bb00863b..1cc1ecaac 100644 --- a/hw/kdrive/trio/Imakefile +++ b/hw/kdrive/trio/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c index e79d899a2..5419ff5fd 100644 --- a/hw/kdrive/trio/s3.c +++ b/hw/kdrive/trio/s3.c @@ -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/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */ #include "s3.h" diff --git a/hw/kdrive/trio/s3.h b/hw/kdrive/trio/s3.h index 81131c996..6f443ea97 100644 --- a/hw/kdrive/trio/s3.h +++ b/hw/kdrive/trio/s3.h @@ -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/trio/s3.h,v 1.4 2000/05/06 22:17:53 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.h,v 1.4 2000/05/06 22:17:53 keithp Exp $ */ #ifndef _S3_H_ #define _S3_H_ diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c index 94a9688a7..b6d0836e9 100644 --- a/hw/kdrive/trio/s3clock.c +++ b/hw/kdrive/trio/s3clock.c @@ -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/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #include "s3.h" diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c index 01035e8d7..804e66092 100644 --- a/hw/kdrive/trio/s3cmap.c +++ b/hw/kdrive/trio/s3cmap.c @@ -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/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */ #include "s3.h" diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c index f67b77b4a..01fa04923 100644 --- a/hw/kdrive/trio/s3curs.c +++ b/hw/kdrive/trio/s3curs.c @@ -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/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c index a4b4241e8..4ac796d71 100644 --- a/hw/kdrive/trio/s3stub.c +++ b/hw/kdrive/trio/s3stub.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */ #include "s3.h" diff --git a/hw/kdrive/ts300/Imakefile b/hw/kdrive/ts300/Imakefile index 9374585a7..329b4825b 100644 --- a/hw/kdrive/ts300/Imakefile +++ b/hw/kdrive/ts300/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c index 394a14979..891a17239 100644 --- a/hw/kdrive/ts300/ts300.c +++ b/hw/kdrive/ts300/ts300.c @@ -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/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */ #include "kdrive.h" diff --git a/hw/kdrive/vesa/Imakefile b/hw/kdrive/vesa/Imakefile index 4a30f94a0..785ef9927 100644 --- a/hw/kdrive/vesa/Imakefile +++ b/hw/kdrive/vesa/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/vesa/Imakefile,v 1.2 2000/09/03 05:11:22 keithp Exp $ +XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/vesa/Imakefile,v 1.2 2000/09/03 05:11:22 keithp Exp $ KDRIVE=.. #include "../Kdrive.tmpl" diff --git a/hw/kdrive/vesa/Xvesa.man b/hw/kdrive/vesa/Xvesa.man index 435225b13..c09defdb6 100644 --- a/hw/kdrive/vesa/Xvesa.man +++ b/hw/kdrive/vesa/Xvesa.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/kdrive/vesa/Xvesa.man,v 1.5 2001/01/24 00:06:10 dawes Exp $ +.\" $RCSId: xc/programs/Xserver/hw/kdrive/vesa/Xvesa.man,v 1.5 2001/01/24 00:06:10 dawes Exp $ .TH Xvesa 1 __vendorversion__ .SH NAME Xvesa \- VESA Bios Extensions tiny X server diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c index af5d12f47..0e57e8d1f 100644 --- a/hw/kdrive/vesa/vbe.c +++ b/hw/kdrive/vesa/vbe.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */ #include "vesa.h" diff --git a/hw/kdrive/vesa/vbe.h b/hw/kdrive/vesa/vbe.h index 6e74cc3b5..500938e41 100644 --- a/hw/kdrive/vesa/vbe.h +++ b/hw/kdrive/vesa/vbe.h @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vbe.h,v 1.6 2001/05/29 04:54:12 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.h,v 1.6 2001/05/29 04:54:12 keithp Exp $ */ #ifndef _VBE_H #define _VBE_H diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c index 1c0013a0e..2a12e132e 100644 --- a/hw/kdrive/vesa/vesa.c +++ b/hw/kdrive/vesa/vesa.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.19 2002/09/29 23:39:47 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.21 2002/10/14 18:01:42 keithp Exp $ */ #include "vesa.h" #ifdef RANDR @@ -34,6 +34,7 @@ Bool vesa_linear_fb = TRUE; Bool vesa_restore = FALSE; Bool vesa_verbose = FALSE; Bool vesa_force_text = FALSE; +Bool vesa_restore_font = TRUE; #define VesaPriv(scr) ((VesaScreenPrivPtr) (scr)->driver) @@ -253,6 +254,58 @@ vesaListModes (void) } } +void +vesaTestMode (void) +{ + Vm86InfoPtr vi; + VesaModePtr modes; + VesaModePtr mode; + VbeInfoPtr vbeInfo; + int nmode; + int n; + + vi = Vm86Setup (); + if (!vi) + { + ErrorF ("Can't setup vm86\n"); + return; + } + modes = vesaGetModes (vi, &nmode); + if (!modes) + { + ErrorF ("No modes available\n"); + return; + } + VbeReportInfo (vi); + vbeInfo = VbeInit (vi); + for (n = 0; n < nmode; n++) + { + if (modes[n].mode == vesa_video_mode) + break; + } + if (n == nmode) + { + ErrorF ("no mode specified\n"); + return; + } + mode = &modes[n]; + if (mode->vbe) + { + ErrorF ("Enable VBE mode 0x%x\n", mode->mode); + VbeSetMode(vi, vbeInfo, mode->mode, FALSE, FALSE); + } + else + { + ErrorF ("Enable BIOS mode 0x%x\n", mode->mode); + VgaSetMode (vi, mode->mode); + } + sleep (2); + ErrorF ("Restore BIOS mode 0x%x\n", 3); + VgaSetMode (vi, 3); + xfree (modes); + Vm86Cleanup (vi); +} + Bool vesaCardInit(KdCardInfo *card) { @@ -1404,28 +1457,35 @@ vesaEnable(ScreenPtr pScreen) screen->fb[0].frameBuffer); } } - memcpy (priv->text, pscr->fb, VESA_TEXT_SAVE); + if (vesa_restore_font) + memcpy (priv->text, pscr->fb, VESA_TEXT_SAVE); break; case VESA_WINDOWED: - for (i = 0; i < VESA_TEXT_SAVE;) + if (vesa_restore_font) { - p = vesaSetWindowWindowed (pScreen, 0, i, VBE_WINDOW_READ, &size); - if(!p) { - ErrorF("Couldn't set window for saving VGA font\n"); - break; - } - if(i + size > VESA_TEXT_SAVE) - size = VESA_TEXT_SAVE - i; - memcpy(((char*)priv->text) + i, p, size); - i += size; - } + for (i = 0; i < VESA_TEXT_SAVE;) + { + p = vesaSetWindowWindowed (pScreen, 0, i, VBE_WINDOW_READ, &size); + if(!p) { + ErrorF("Couldn't set window for saving VGA font\n"); + break; + } + if(i + size > VESA_TEXT_SAVE) + size = VESA_TEXT_SAVE - i; + memcpy(((char*)priv->text) + i, p, size); + i += size; + } + } break; case VESA_PLANAR: - for (i = 0; i < 4; i++) + if (vesa_restore_font) { - p = vesaSetWindowPlanar (pScreen, 0, i, VBE_WINDOW_READ, &size); - memcpy (((char *)priv->text) + i * (VESA_TEXT_SAVE/4), p, - (VESA_TEXT_SAVE/4)); + for (i = 0; i < 4; i++) + { + p = vesaSetWindowPlanar (pScreen, 0, i, VBE_WINDOW_READ, &size); + memcpy (((char *)priv->text) + i * (VESA_TEXT_SAVE/4), p, + (VESA_TEXT_SAVE/4)); + } } break; } @@ -1514,33 +1574,35 @@ vesaDisable(ScreenPtr pScreen) CARD32 size; char *p; - switch (pscr->mapping) { - case VESA_LINEAR: - case VESA_MONO: - memcpy(pscr->fb, priv->text, VESA_TEXT_SAVE); - break; - case VESA_WINDOWED: - while(i < VESA_TEXT_SAVE) { - p = vesaSetWindowWindowed (pScreen, 0, i, VBE_WINDOW_WRITE, &size); - if(!p) { - ErrorF("Couldn't set window for restoring VGA font\n"); - break; - } - if(i + size > VESA_TEXT_SAVE) - size = VESA_TEXT_SAVE - i; - memcpy(p, ((char*)priv->text) + i, size); - i += size; - } - break; - case VESA_PLANAR: - for (i = 0; i < 4; i++) - { - p = vesaSetWindowPlanar (pScreen, 0, i, VBE_WINDOW_WRITE, &size); - memcpy (p, - ((char *)priv->text) + i * (VESA_TEXT_SAVE/4), - (VESA_TEXT_SAVE/4)); + if (vesa_restore_font) { + switch (pscr->mapping) { + case VESA_LINEAR: + case VESA_MONO: + memcpy(pscr->fb, priv->text, VESA_TEXT_SAVE); + break; + case VESA_WINDOWED: + while(i < VESA_TEXT_SAVE) { + p = vesaSetWindowWindowed (pScreen, 0, i, VBE_WINDOW_WRITE, &size); + if(!p) { + ErrorF("Couldn't set window for restoring VGA font\n"); + break; + } + if(i + size > VESA_TEXT_SAVE) + size = VESA_TEXT_SAVE - i; + memcpy(p, ((char*)priv->text) + i, size); + i += size; + } + break; + case VESA_PLANAR: + for (i = 0; i < 4; i++) + { + p = vesaSetWindowPlanar (pScreen, 0, i, VBE_WINDOW_WRITE, &size); + memcpy (p, + ((char *)priv->text) + i * (VESA_TEXT_SAVE/4), + (VESA_TEXT_SAVE/4)); + } + break; } - break; } vesaUnmapFramebuffer (screen); } @@ -1771,6 +1833,9 @@ vesaProcessArgument (int argc, char **argv, int i) } else if(!strcmp(argv[i], "-listmodes")) { vesaListModes(); exit(0); + } else if(!strcmp(argv[i], "-vesatest")) { + vesaTestMode(); + exit (0); } else if(!strcmp(argv[i], "-swaprgb")) { vesa_swap_rgb = TRUE; return 1; @@ -1786,6 +1851,9 @@ vesaProcessArgument (int argc, char **argv, int i) } else if(!strcmp(argv[i], "-force-text")) { vesa_force_text = TRUE; return 1; + } else if(!strcmp(argv[i], "-trash-font")) { + vesa_restore_font = FALSE; + return 1; } return 0; diff --git a/hw/kdrive/vesa/vesa.h b/hw/kdrive/vesa/vesa.h index ceac5911a..72339459a 100644 --- a/hw/kdrive/vesa/vesa.h +++ b/hw/kdrive/vesa/vesa.h @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.h,v 1.13 2002/09/29 23:39:47 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesa.h,v 1.13 2002/09/29 23:39:47 keithp Exp $ */ #ifndef _VESA_H_ #define _VESA_H_ diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c index e61f9d11f..4930bc0c0 100644 --- a/hw/kdrive/vesa/vesainit.c +++ b/hw/kdrive/vesa/vesainit.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */ +/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */ #include "vesa.h" diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c index a87b70a2d..36e6b46a4 100644 --- a/hw/kdrive/vesa/vga.c +++ b/hw/kdrive/vesa/vga.c @@ -1,7 +1,7 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vga.c,v 1.1 2000/10/20 00:19:51 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.c,v 1.1 2000/10/20 00:19:51 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 diff --git a/hw/kdrive/vesa/vga.h b/hw/kdrive/vesa/vga.h index 873c1ee95..80d6bb42a 100644 --- a/hw/kdrive/vesa/vga.h +++ b/hw/kdrive/vesa/vga.h @@ -1,7 +1,7 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vga.h,v 1.1 2000/10/20 00:19:51 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.h,v 1.1 2000/10/20 00:19:51 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 diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c index 4c9c1ff76..e6eaa53d0 100644 --- a/hw/kdrive/vesa/vm86.c +++ b/hw/kdrive/vesa/vm86.c @@ -1,7 +1,7 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vm86.c,v 1.2 2002/02/19 00:18:05 keithp Exp $ + * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vm86.c,v 1.2 2002/02/19 00:18:05 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 diff --git a/hw/kdrive/vesa/vm86.h b/hw/kdrive/vesa/vm86.h index c0338e9d2..b5c371e2b 100644 --- a/hw/kdrive/vesa/vm86.h +++ b/hw/kdrive/vesa/vm86.h @@ -1,7 +1,7 @@ /* - * $XFree86$ + * $RCSId: $ * - * 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 diff --git a/hw/kdrive/vxworks/Imakefile b/hw/kdrive/vxworks/Imakefile index 603b9b6f4..fea4f3416 100644 --- a/hw/kdrive/vxworks/Imakefile +++ b/hw/kdrive/vxworks/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: $ +XCOMM $RCSId: $ #include <Server.tmpl> SRCS = vxworks.c vxkbd.c vxkmouse.c |