summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
commit0664db19bf37f9dd69cca6adff4e238e310c3092 (patch)
treed2cc9d3132d40796018a853df38877fa5b027f18
parent9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff)
Merging XORG-CURRENT into trunk
-rw-r--r--GL/apple/aglGlx.c2
-rw-r--r--GL/apple/indirect.c2
-rw-r--r--GL/glx/g_disptab.c2
-rw-r--r--GL/glx/g_disptab.h2
-rw-r--r--GL/glx/g_disptab_EXT.c2
-rw-r--r--GL/glx/g_disptab_EXT.h2
-rw-r--r--GL/glx/g_render.c40
-rw-r--r--GL/glx/g_renderswap.c115
-rw-r--r--GL/glx/g_single.c2
-rw-r--r--GL/glx/g_singleswap.c38
-rw-r--r--GL/glx/global.c2
-rw-r--r--GL/glx/glxbuf.c2
-rw-r--r--GL/glx/glxbuf.h2
-rw-r--r--GL/glx/glxcmds.c2
-rw-r--r--GL/glx/glxcmdsswap.c5
-rw-r--r--GL/glx/glxcontext.h2
-rw-r--r--GL/glx/glxdrawable.h2
-rw-r--r--GL/glx/glxerror.h2
-rw-r--r--GL/glx/glxext.c2
-rw-r--r--GL/glx/glxext.h2
-rw-r--r--GL/glx/glxfb.c2
-rw-r--r--GL/glx/glxfb.h2
-rw-r--r--GL/glx/glximports.c2
-rw-r--r--GL/glx/glximports.h2
-rw-r--r--GL/glx/glxmem.c2
-rw-r--r--GL/glx/glxmem.h2
-rw-r--r--GL/glx/glxpix.c2
-rw-r--r--GL/glx/glxpix.h2
-rw-r--r--GL/glx/glxscreens.c2
-rw-r--r--GL/glx/glxscreens.h2
-rw-r--r--GL/glx/glxserver.h2
-rw-r--r--GL/glx/glxutil.c2
-rw-r--r--GL/glx/glxutil.h2
-rw-r--r--GL/glx/impsize.h2
-rw-r--r--GL/glx/render2.c2
-rw-r--r--GL/glx/render2swap.c7
-rw-r--r--GL/glx/renderpix.c2
-rw-r--r--GL/glx/renderpixswap.c2
-rw-r--r--GL/glx/rensize.c2
-rw-r--r--GL/glx/rensizetab.c2
-rw-r--r--GL/glx/single2.c2
-rw-r--r--GL/glx/single2swap.c4
-rw-r--r--GL/glx/singlepix.c2
-rw-r--r--GL/glx/singlepixswap.c2
-rw-r--r--GL/glx/singlesize.c2
-rw-r--r--GL/glx/singlesize.h2
-rw-r--r--GL/glx/unpack.h7
-rw-r--r--GL/glx/xfont.c2
-rw-r--r--GL/include/GL/glx_ansic.h2
-rw-r--r--GL/include/GL/xf86glx.h2
-rw-r--r--XTrap/xtrapddmi.c2
-rw-r--r--XTrap/xtrapdi.c3
-rw-r--r--XTrap/xtrapdiswp.c2
-rw-r--r--XTrap/xtrapditbl.c2
-rw-r--r--Xext/EVI.c2
-rw-r--r--Xext/EVIstruct.h2
-rw-r--r--Xext/appgroup.c2
-rw-r--r--Xext/appgroup.h2
-rw-r--r--Xext/bigreq.c2
-rw-r--r--Xext/cup.c2
-rw-r--r--Xext/dpms.c2
-rw-r--r--Xext/dpmsproc.h2
-rw-r--r--Xext/dpmsstubs.c2
-rw-r--r--Xext/fontcache.c2
-rw-r--r--Xext/mbuf.c2
-rw-r--r--Xext/mbufbf.c2
-rw-r--r--Xext/mbufpx.c2
-rw-r--r--Xext/mitmisc.c2
-rw-r--r--Xext/panoramiX.c2
-rw-r--r--Xext/panoramiX.h51
-rw-r--r--Xext/panoramiXSwap.c2
-rw-r--r--Xext/panoramiXh.h2
-rw-r--r--Xext/panoramiXprocs.c2
-rw-r--r--Xext/panoramiXsrv.h2
-rw-r--r--Xext/sampleEVI.c2
-rw-r--r--Xext/saver.c8
-rw-r--r--Xext/security.c3
-rw-r--r--Xext/shape.c3
-rw-r--r--Xext/shm.c2
-rw-r--r--Xext/sleepuntil.c2
-rw-r--r--Xext/sync.c2
-rw-r--r--Xext/xcmisc.c2
-rw-r--r--Xext/xf86bigfont.c2
-rw-r--r--Xext/xprint.c2
-rw-r--r--Xext/xres.c3
-rw-r--r--Xext/xtest.c3
-rw-r--r--Xext/xtest1dd.c2
-rw-r--r--Xext/xtest1dd.h2
-rw-r--r--Xext/xtest1di.c3
-rw-r--r--Xext/xvdisp.c3
-rw-r--r--Xext/xvdisp.h2
-rw-r--r--Xext/xvdix.h2
-rw-r--r--Xext/xvmain.c3
-rw-r--r--Xext/xvmc.c2
-rw-r--r--Xext/xvmcext.h2
-rw-r--r--Xi/allowev.c2
-rw-r--r--Xi/allowev.h2
-rw-r--r--Xi/chgdctl.c2
-rw-r--r--Xi/chgdctl.h2
-rw-r--r--Xi/chgfctl.c2
-rw-r--r--Xi/chgfctl.h2
-rw-r--r--Xi/chgkbd.c2
-rw-r--r--Xi/chgkbd.h2
-rw-r--r--Xi/chgkmap.c2
-rw-r--r--Xi/chgkmap.h2
-rw-r--r--Xi/chgprop.c2
-rw-r--r--Xi/chgprop.h2
-rw-r--r--Xi/chgptr.c2
-rw-r--r--Xi/chgptr.h2
-rw-r--r--Xi/closedev.c2
-rw-r--r--Xi/closedev.h2
-rw-r--r--Xi/devbell.c2
-rw-r--r--Xi/devbell.h2
-rw-r--r--Xi/exevents.c2
-rw-r--r--Xi/exglobals.h2
-rw-r--r--Xi/extinit.c2
-rw-r--r--Xi/getbmap.c2
-rw-r--r--Xi/getbmap.h2
-rw-r--r--Xi/getdctl.c2
-rw-r--r--Xi/getdctl.h2
-rw-r--r--Xi/getfctl.c2
-rw-r--r--Xi/getfctl.h2
-rw-r--r--Xi/getfocus.c2
-rw-r--r--Xi/getfocus.h2
-rw-r--r--Xi/getkmap.c2
-rw-r--r--Xi/getkmap.h2
-rw-r--r--Xi/getmmap.c2
-rw-r--r--Xi/getmmap.h2
-rw-r--r--Xi/getprop.c2
-rw-r--r--Xi/getprop.h2
-rw-r--r--Xi/getselev.c2
-rw-r--r--Xi/getselev.h2
-rw-r--r--Xi/getvers.c2
-rw-r--r--Xi/getvers.h2
-rw-r--r--Xi/grabdev.c2
-rw-r--r--Xi/grabdev.h2
-rw-r--r--Xi/grabdevb.c2
-rw-r--r--Xi/grabdevb.h2
-rw-r--r--Xi/grabdevk.c2
-rw-r--r--Xi/grabdevk.h2
-rw-r--r--Xi/gtmotion.c2
-rw-r--r--Xi/gtmotion.h2
-rw-r--r--Xi/listdev.c2
-rw-r--r--Xi/listdev.h2
-rw-r--r--Xi/opendev.c2
-rw-r--r--Xi/opendev.h2
-rw-r--r--Xi/queryst.c2
-rw-r--r--Xi/queryst.h2
-rw-r--r--Xi/selectev.c2
-rw-r--r--Xi/selectev.h2
-rw-r--r--Xi/sendexev.c2
-rw-r--r--Xi/sendexev.h2
-rw-r--r--Xi/setbmap.c2
-rw-r--r--Xi/setbmap.h2
-rw-r--r--Xi/setdval.c2
-rw-r--r--Xi/setdval.h2
-rw-r--r--Xi/setfocus.c2
-rw-r--r--Xi/setfocus.h2
-rw-r--r--Xi/setmmap.c2
-rw-r--r--Xi/setmmap.h2
-rw-r--r--Xi/setmode.c2
-rw-r--r--Xi/setmode.h2
-rw-r--r--Xi/stubs.c2
-rw-r--r--Xi/ungrdev.c2
-rw-r--r--Xi/ungrdev.h2
-rw-r--r--Xi/ungrdevb.c2
-rw-r--r--Xi/ungrdevb.h2
-rw-r--r--Xi/ungrdevk.c2
-rw-r--r--Xi/ungrdevk.h2
-rw-r--r--XpConfig/C/print/Xprinters8
-rw-r--r--XpConfig/C/print/attributes/document12
-rw-r--r--XpConfig/C/print/attributes/printer18
-rw-r--r--XpConfig/C/print/models/CANONBJ10E-GS/model-config23
-rw-r--r--XpConfig/C/print/models/GSdefault/model-config137
-rw-r--r--XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias1
-rw-r--r--XpConfig/C/print/models/HPDJ1600C/model-config34
-rw-r--r--XpConfig/C/print/models/HPLJ4050-PS/model-config36
-rw-r--r--XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias1
-rw-r--r--XpConfig/C/print/models/HPLJ4family/model-config35
-rw-r--r--XpConfig/C/print/models/PS2PDFspooldir-GS/model-config72
-rwxr-xr-xXpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh130
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmfbin0 -> 6716 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmfbin0 -> 6728 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmfbin0 -> 6712 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmfbin0 -> 6724 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmfbin0 -> 6612 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmfbin0 -> 6636 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmfbin0 -> 6608 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Courier.pmfbin0 -> 6592 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmfbin0 -> 6680 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmfbin0 -> 6692 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmfbin0 -> 6688 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmfbin0 -> 6672 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmfbin0 -> 6628 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmfbin0 -> 6640 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmfbin0 -> 6624 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmfbin0 -> 6636 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmfbin0 -> 6644 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmfbin0 -> 6656 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmfbin0 -> 6652 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmfbin0 -> 6648 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmfbin0 -> 6680 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmfbin0 -> 6692 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmfbin0 -> 6684 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmfbin0 -> 6696 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Symbol.pmfbin0 -> 6556 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmfbin0 -> 6660 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmfbin0 -> 6672 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmfbin0 -> 6668 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmfbin0 -> 6664 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmfbin0 -> 6676 bytes
-rw-r--r--XpConfig/C/print/models/PSdefault/model-config136
-rw-r--r--XpConfig/C/print/models/PSspooldir/model-config71
-rwxr-xr-xXpConfig/C/print/models/PSspooldir/spooltodir.sh127
-rw-r--r--doc/Xserver.man.pre2
-rw-r--r--hw/xfree86/dixmods/GLcoremodule.c4
-rw-r--r--hw/xfree86/dixmods/bitmapmod.c2
-rw-r--r--hw/xfree86/dixmods/extmod/dgaproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/modinit.c4
-rw-r--r--hw/xfree86/dixmods/extmod/modinit.h3
-rw-r--r--hw/xfree86/dixmods/extmod/vidmodeproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga2.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dgaext.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86miscproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86vmode.c3
-rw-r--r--hw/xfree86/dixmods/extmod/xvmod.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xvmodproc.h2
-rw-r--r--hw/xfree86/dixmods/ftmodule.c2
-rw-r--r--hw/xfree86/dixmods/glxmodule.c4
-rw-r--r--hw/xfree86/dixmods/type1mod.c2
-rw-r--r--hw/xfree86/dixmods/xf86XTrapModule.c4
-rw-r--r--hw/xfree86/dri/dri.c2
-rw-r--r--hw/xfree86/dri/dri.h2
-rw-r--r--hw/xfree86/dri/drimodule.c5
-rw-r--r--hw/xfree86/dri/dristruct.h2
-rw-r--r--hw/xfree86/dri/sarea.h4
-rw-r--r--hw/xfree86/dri/xf86dri.c2
-rw-r--r--hw/xfree86/x86emu/debug.c2
-rw-r--r--hw/xfree86/x86emu/decode.c3
-rw-r--r--hw/xfree86/x86emu/fpu.c2
-rw-r--r--hw/xfree86/x86emu/ops.c2
-rw-r--r--hw/xfree86/x86emu/ops2.c2
-rw-r--r--hw/xfree86/x86emu/sys.c2
-rw-r--r--hw/xfree86/x86emu/x86emu.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/debug.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/decode.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/fpu_regs.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/prim_asm.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/regs.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/types.h4
-rw-r--r--hw/xfree86/x86emu/x86emu/x86emui.h2
-rw-r--r--os/strlcat.c2
-rw-r--r--os/strlcpy.c2
-rw-r--r--xkb/XKBAlloc.c2
-rw-r--r--xkb/XKBGAlloc.c2
-rw-r--r--xkb/XKBMAlloc.c2
-rw-r--r--xkb/XKBMisc.c2
-rw-r--r--xkb/maprules.c2
-rw-r--r--xkb/xkbconfig.c2
-rw-r--r--xkb/xkberrs.c2
-rw-r--r--xkb/xkbfmisc.c2
-rw-r--r--xkb/xkbout.c2
-rw-r--r--xkb/xkbtext.c2
-rw-r--r--xkb/xkmread.c2
265 files changed, 1251 insertions, 313 deletions
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c
index ae3276a02..106a6464d 100644
--- a/GL/apple/aglGlx.c
+++ b/GL/apple/aglGlx.c
@@ -32,7 +32,7 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
#include "quartzCommon.h"
#include <AGL/agl.h>
diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c
index b1292b606..c4d235a47 100644
--- a/GL/apple/indirect.c
+++ b/GL/apple/indirect.c
@@ -34,7 +34,7 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
#include "dri.h"
#include "quartz.h"
diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c
index 47988a595..12d1abe56 100644
--- a/GL/glx/g_disptab.c
+++ b/GL/glx/g_disptab.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h
index e311d98c3..25c233ac7 100644
--- a/GL/glx/g_disptab.h
+++ b/GL/glx/g_disptab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_h_
#define _GLX_g_disptab_h_
diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c
index 472a2d443..1fe07f40e 100644
--- a/GL/glx/g_disptab_EXT.c
+++ b/GL/glx/g_disptab_EXT.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h
index 3aca9347f..89184c1b6 100644
--- a/GL/glx/g_disptab_EXT.h
+++ b/GL/glx/g_disptab_EXT.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_EXT_h_
#define _GLX_g_disptab_EXT_h_
diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c
index d351dc1be..a599423cc 100644
--- a/GL/glx/g_render.c
+++ b/GL/glx/g_render.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
@@ -68,21 +68,11 @@ void __glXDisp_Begin(GLbyte *pc)
#define __GLX_SWAP_GLdouble(ptr) __GLX_SWAP_DOUBLE(ptr)
#define __GLX_SWAP_GLfloat(ptr) __GLX_SWAP_FLOAT(ptr)
-#define __GLX_DECLARE_SWAP_GLbyte_ARRAY
-#define __GLX_DECLARE_SWAP_GLshort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLenum_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLubyte_ARRAY
-#define __GLX_DECLARE_SWAP_GLushort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLuint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLdouble_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-#define __GLX_DECLARE_SWAP_GLfloat_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
-
-#define __GLX_SWAP_GLbyte_ARRAY(ptr,count)
+#define __GLX_SWAP_GLbyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw;
#define __GLX_SWAP_GLshort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count)
#define __GLX_SWAP_GLint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
#define __GLX_SWAP_GLenum_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
-#define __GLX_SWAP_GLubyte_ARRAY(ptr,count)
+#define __GLX_SWAP_GLubyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw;
#define __GLX_SWAP_GLushort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count)
#define __GLX_SWAP_GLuint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
#define __GLX_SWAP_GLdouble_ARRAY(ptr,count) __GLX_SWAP_DOUBLE_ARRAY(ptr,count)
@@ -125,12 +115,28 @@ void __glXDisp_Begin(GLbyte *pc)
} \
void __glXDispSwap_ ## name ( GLbyte * pc ) \
{ \
- __GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
+ __GLX_DECLARE_SWAP_VARIABLES; \
+ __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
GLX_DO_ALIGN_MAGIC( 3, type ); \
__GLX_SWAP_ ## type ## _ARRAY(pc, 3); \
gl ## name ( (type *) pc ); \
}
+#define dispatch_template_4( name, type ) \
+ void __glXDisp_ ## name ( GLbyte * pc ) \
+ { \
+ GLX_DO_ALIGN_MAGIC( 4, type ); \
+ gl ## name ( (type *) pc ); \
+ } \
+ void __glXDispSwap_ ## name ( GLbyte * pc ) \
+ { \
+ __GLX_DECLARE_SWAP_VARIABLES; \
+ __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
+ GLX_DO_ALIGN_MAGIC( 4, type ); \
+ __GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
+ gl ## name ( (type *) pc ); \
+ }
+
#define dispatch_template_4s( name, type ) \
void __glXDisp_ ## name ( GLbyte * pc ) \
{ \
@@ -140,7 +146,8 @@ void __glXDisp_Begin(GLbyte *pc)
} \
void __glXDispSwap_ ## name ( GLbyte * pc ) \
{ \
- __GLX_DECLARE_SWAP_ ##type ## _ARRAY; \
+ __GLX_DECLARE_SWAP_VARIABLES; \
+ __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
GLX_DO_ALIGN_MAGIC( 4, type ); \
__GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
gl ## name ( ((type *) pc)[0], ((type *) pc)[1], \
@@ -177,7 +184,8 @@ void __glXDisp_Begin(GLbyte *pc)
void __glXDispSwap_ ## name ( GLbyte * pc ) \
{ \
GLenum pname; GLint compsize; \
- __GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
+ __GLX_DECLARE_SWAP_VARIABLES; \
+ __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
__GLX_SWAP_INT(pc + 0); \
pname = *(GLenum *)(pc + 0); \
compsize = __gl ## name ## _size(pname); \
diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c
index e849405db..2a8d0c02f 100644
--- a/GL/glx/g_renderswap.c
+++ b/GL/glx/g_renderswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.8 2004/01/28 18:11:50 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -79,6 +79,7 @@ void __glXDispSwap_Color3bv(GLbyte *pc)
void __glXDispSwap_Color3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -96,6 +97,7 @@ void __glXDispSwap_Color3dv(GLbyte *pc)
void __glXDispSwap_Color3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -107,6 +109,7 @@ void __glXDispSwap_Color3fv(GLbyte *pc)
void __glXDispSwap_Color3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -118,6 +121,7 @@ void __glXDispSwap_Color3iv(GLbyte *pc)
void __glXDispSwap_Color3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -136,6 +140,7 @@ void __glXDispSwap_Color3ubv(GLbyte *pc)
void __glXDispSwap_Color3uiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -147,6 +152,7 @@ void __glXDispSwap_Color3uiv(GLbyte *pc)
void __glXDispSwap_Color3usv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -165,6 +171,7 @@ void __glXDispSwap_Color4bv(GLbyte *pc)
void __glXDispSwap_Color4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
@@ -183,6 +190,7 @@ void __glXDispSwap_Color4dv(GLbyte *pc)
void __glXDispSwap_Color4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -194,6 +202,7 @@ void __glXDispSwap_Color4fv(GLbyte *pc)
void __glXDispSwap_Color4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -205,6 +214,7 @@ void __glXDispSwap_Color4iv(GLbyte *pc)
void __glXDispSwap_Color4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -223,6 +233,7 @@ void __glXDispSwap_Color4ubv(GLbyte *pc)
void __glXDispSwap_Color4uiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -234,6 +245,7 @@ void __glXDispSwap_Color4uiv(GLbyte *pc)
void __glXDispSwap_Color4usv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -258,6 +270,7 @@ void __glXDispSwap_End(GLbyte *pc)
void __glXDispSwap_Indexdv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -275,6 +288,7 @@ void __glXDispSwap_Indexdv(GLbyte *pc)
void __glXDispSwap_Indexfv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -286,6 +300,7 @@ void __glXDispSwap_Indexfv(GLbyte *pc)
void __glXDispSwap_Indexiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 1);
@@ -297,6 +312,7 @@ void __glXDispSwap_Indexiv(GLbyte *pc)
void __glXDispSwap_Indexsv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
@@ -315,6 +331,7 @@ void __glXDispSwap_Normal3bv(GLbyte *pc)
void __glXDispSwap_Normal3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -332,6 +349,7 @@ void __glXDispSwap_Normal3dv(GLbyte *pc)
void __glXDispSwap_Normal3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -343,6 +361,7 @@ void __glXDispSwap_Normal3fv(GLbyte *pc)
void __glXDispSwap_Normal3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -354,6 +373,7 @@ void __glXDispSwap_Normal3iv(GLbyte *pc)
void __glXDispSwap_Normal3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -365,6 +385,7 @@ void __glXDispSwap_Normal3sv(GLbyte *pc)
void __glXDispSwap_RasterPos2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -382,6 +403,7 @@ void __glXDispSwap_RasterPos2dv(GLbyte *pc)
void __glXDispSwap_RasterPos2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -393,6 +415,7 @@ void __glXDispSwap_RasterPos2fv(GLbyte *pc)
void __glXDispSwap_RasterPos2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -404,6 +427,7 @@ void __glXDispSwap_RasterPos2iv(GLbyte *pc)
void __glXDispSwap_RasterPos2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -415,6 +439,7 @@ void __glXDispSwap_RasterPos2sv(GLbyte *pc)
void __glXDispSwap_RasterPos3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -432,6 +457,7 @@ void __glXDispSwap_RasterPos3dv(GLbyte *pc)
void __glXDispSwap_RasterPos3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -443,6 +469,7 @@ void __glXDispSwap_RasterPos3fv(GLbyte *pc)
void __glXDispSwap_RasterPos3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -454,6 +481,7 @@ void __glXDispSwap_RasterPos3iv(GLbyte *pc)
void __glXDispSwap_RasterPos3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -465,6 +493,7 @@ void __glXDispSwap_RasterPos3sv(GLbyte *pc)
void __glXDispSwap_RasterPos4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -482,6 +511,7 @@ void __glXDispSwap_RasterPos4dv(GLbyte *pc)
void __glXDispSwap_RasterPos4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -493,6 +523,7 @@ void __glXDispSwap_RasterPos4fv(GLbyte *pc)
void __glXDispSwap_RasterPos4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -504,6 +535,7 @@ void __glXDispSwap_RasterPos4iv(GLbyte *pc)
void __glXDispSwap_RasterPos4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -515,6 +547,7 @@ void __glXDispSwap_RasterPos4sv(GLbyte *pc)
void __glXDispSwap_Rectdv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -534,6 +567,7 @@ void __glXDispSwap_Rectdv(GLbyte *pc)
void __glXDispSwap_Rectfv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -547,6 +581,7 @@ void __glXDispSwap_Rectfv(GLbyte *pc)
void __glXDispSwap_Rectiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -560,6 +595,7 @@ void __glXDispSwap_Rectiv(GLbyte *pc)
void __glXDispSwap_Rectsv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -573,6 +609,7 @@ void __glXDispSwap_Rectsv(GLbyte *pc)
void __glXDispSwap_TexCoord1dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -590,6 +627,7 @@ void __glXDispSwap_TexCoord1dv(GLbyte *pc)
void __glXDispSwap_TexCoord1fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -601,6 +639,7 @@ void __glXDispSwap_TexCoord1fv(GLbyte *pc)
void __glXDispSwap_TexCoord1iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 1);
@@ -612,6 +651,7 @@ void __glXDispSwap_TexCoord1iv(GLbyte *pc)
void __glXDispSwap_TexCoord1sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
@@ -623,6 +663,7 @@ void __glXDispSwap_TexCoord1sv(GLbyte *pc)
void __glXDispSwap_TexCoord2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -640,6 +681,7 @@ void __glXDispSwap_TexCoord2dv(GLbyte *pc)
void __glXDispSwap_TexCoord2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -651,6 +693,7 @@ void __glXDispSwap_TexCoord2fv(GLbyte *pc)
void __glXDispSwap_TexCoord2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -662,6 +705,7 @@ void __glXDispSwap_TexCoord2iv(GLbyte *pc)
void __glXDispSwap_TexCoord2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -673,6 +717,7 @@ void __glXDispSwap_TexCoord2sv(GLbyte *pc)
void __glXDispSwap_TexCoord3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -690,6 +735,7 @@ void __glXDispSwap_TexCoord3dv(GLbyte *pc)
void __glXDispSwap_TexCoord3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -701,6 +747,7 @@ void __glXDispSwap_TexCoord3fv(GLbyte *pc)
void __glXDispSwap_TexCoord3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -712,6 +759,7 @@ void __glXDispSwap_TexCoord3iv(GLbyte *pc)
void __glXDispSwap_TexCoord3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -723,6 +771,7 @@ void __glXDispSwap_TexCoord3sv(GLbyte *pc)
void __glXDispSwap_TexCoord4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -740,6 +789,7 @@ void __glXDispSwap_TexCoord4dv(GLbyte *pc)
void __glXDispSwap_TexCoord4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -751,6 +801,7 @@ void __glXDispSwap_TexCoord4fv(GLbyte *pc)
void __glXDispSwap_TexCoord4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -762,6 +813,7 @@ void __glXDispSwap_TexCoord4iv(GLbyte *pc)
void __glXDispSwap_TexCoord4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -773,6 +825,7 @@ void __glXDispSwap_TexCoord4sv(GLbyte *pc)
void __glXDispSwap_Vertex2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -790,6 +843,7 @@ void __glXDispSwap_Vertex2dv(GLbyte *pc)
void __glXDispSwap_Vertex2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -801,6 +855,7 @@ void __glXDispSwap_Vertex2fv(GLbyte *pc)
void __glXDispSwap_Vertex2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -812,6 +867,7 @@ void __glXDispSwap_Vertex2iv(GLbyte *pc)
void __glXDispSwap_Vertex2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -823,6 +879,7 @@ void __glXDispSwap_Vertex2sv(GLbyte *pc)
void __glXDispSwap_Vertex3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -840,6 +897,7 @@ void __glXDispSwap_Vertex3dv(GLbyte *pc)
void __glXDispSwap_Vertex3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -851,6 +909,7 @@ void __glXDispSwap_Vertex3fv(GLbyte *pc)
void __glXDispSwap_Vertex3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -862,6 +921,7 @@ void __glXDispSwap_Vertex3iv(GLbyte *pc)
void __glXDispSwap_Vertex3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -873,6 +933,7 @@ void __glXDispSwap_Vertex3sv(GLbyte *pc)
void __glXDispSwap_Vertex4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -890,6 +951,7 @@ void __glXDispSwap_Vertex4dv(GLbyte *pc)
void __glXDispSwap_Vertex4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -901,6 +963,7 @@ void __glXDispSwap_Vertex4fv(GLbyte *pc)
void __glXDispSwap_Vertex4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -912,6 +975,7 @@ void __glXDispSwap_Vertex4iv(GLbyte *pc)
void __glXDispSwap_Vertex4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -923,6 +987,7 @@ void __glXDispSwap_Vertex4sv(GLbyte *pc)
void __glXDispSwap_ClipPlane(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -981,6 +1046,7 @@ void __glXDispSwap_Fogfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1012,6 +1078,7 @@ void __glXDispSwap_Fogiv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1069,6 +1136,7 @@ void __glXDispSwap_Lightfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1104,6 +1172,7 @@ void __glXDispSwap_Lightiv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1137,6 +1206,7 @@ void __glXDispSwap_LightModelfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1168,6 +1238,7 @@ void __glXDispSwap_LightModeliv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1225,6 +1296,7 @@ void __glXDispSwap_Materialfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1260,6 +1332,7 @@ void __glXDispSwap_Materialiv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1347,6 +1420,7 @@ void __glXDispSwap_TexParameterfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1382,6 +1456,7 @@ void __glXDispSwap_TexParameteriv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1417,6 +1492,7 @@ void __glXDispSwap_TexEnvfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1452,6 +1528,7 @@ void __glXDispSwap_TexEnviv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1497,6 +1574,7 @@ void __glXDispSwap_TexGendv(GLbyte *pc)
GLint cmdlen;
#endif
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1540,6 +1618,7 @@ void __glXDispSwap_TexGenfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1575,6 +1654,7 @@ void __glXDispSwap_TexGeniv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1911,6 +1991,7 @@ void __glXDispSwap_MapGrid2f(GLbyte *pc)
void __glXDispSwap_EvalCoord1dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1928,6 +2009,7 @@ void __glXDispSwap_EvalCoord1dv(GLbyte *pc)
void __glXDispSwap_EvalCoord1fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -1939,6 +2021,7 @@ void __glXDispSwap_EvalCoord1fv(GLbyte *pc)
void __glXDispSwap_EvalCoord2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1956,6 +2039,7 @@ void __glXDispSwap_EvalCoord2dv(GLbyte *pc)
void __glXDispSwap_EvalCoord2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -2143,6 +2227,7 @@ void __glXDispSwap_PixelTransferi(GLbyte *pc)
void __glXDispSwap_PixelMapfv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2160,6 +2245,7 @@ void __glXDispSwap_PixelMapfv(GLbyte *pc)
void __glXDispSwap_PixelMapuiv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2177,6 +2263,7 @@ void __glXDispSwap_PixelMapuiv(GLbyte *pc)
void __glXDispSwap_PixelMapusv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2277,6 +2364,7 @@ void __glXDispSwap_LoadIdentity(GLbyte *pc)
void __glXDispSwap_LoadMatrixf(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
@@ -2288,6 +2376,7 @@ void __glXDispSwap_LoadMatrixf(GLbyte *pc)
void __glXDispSwap_LoadMatrixd(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2316,6 +2405,7 @@ void __glXDispSwap_MatrixMode(GLbyte *pc)
void __glXDispSwap_MultMatrixf(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
@@ -2327,6 +2417,7 @@ void __glXDispSwap_MultMatrixf(GLbyte *pc)
void __glXDispSwap_MultMatrixd(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2637,6 +2728,7 @@ void __glXDispSwap_BindTexture(GLbyte *pc)
void __glXDispSwap_PrioritizeTextures(GLbyte *pc)
{
GLsizei n;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2690,6 +2782,7 @@ void __glXDispSwap_ColorTableParameterfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2710,6 +2803,7 @@ void __glXDispSwap_ColorTableParameteriv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2783,6 +2877,7 @@ void __glXDispSwap_ConvolutionParameterfv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2818,6 +2913,7 @@ void __glXDispSwap_ConvolutionParameteriv(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -2966,6 +3062,7 @@ void __glXDispSwap_ActiveTextureARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2985,6 +3082,7 @@ void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2998,6 +3096,7 @@ void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3011,6 +3110,7 @@ void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3024,6 +3124,7 @@ void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -3043,6 +3144,7 @@ void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3056,6 +3158,7 @@ void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3069,6 +3172,7 @@ void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3082,6 +3186,7 @@ void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -3101,6 +3206,7 @@ void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3114,6 +3220,7 @@ void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3127,6 +3234,7 @@ void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3140,6 +3248,7 @@ void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -3159,6 +3268,7 @@ void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3172,6 +3282,7 @@ void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3185,6 +3296,7 @@ void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc)
void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -3218,6 +3330,7 @@ void __glXDispSwap_PointParameterfvARB(GLbyte *pc)
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
diff --git a/GL/glx/g_single.c b/GL/glx/g_single.c
index 5bcec133c..ce446470f 100644
--- a/GL/glx/g_single.c
+++ b/GL/glx/g_single.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/g_singleswap.c b/GL/glx/g_singleswap.c
index 5efcbe535..71722e57f 100644
--- a/GL/glx/g_singleswap.c
+++ b/GL/glx/g_singleswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.6 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -234,6 +234,7 @@ int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc)
int error;
GLdouble answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -311,6 +312,7 @@ int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -363,6 +365,7 @@ int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -415,6 +418,7 @@ int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -469,6 +473,7 @@ int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -524,6 +529,7 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
int error;
GLdouble answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -580,6 +586,7 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -636,6 +643,7 @@ int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -691,6 +699,7 @@ int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -745,6 +754,7 @@ int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -799,6 +809,7 @@ int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -851,6 +862,7 @@ int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
int error;
GLuint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -903,6 +915,7 @@ int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
int error;
GLushort answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -955,6 +968,7 @@ int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1009,6 +1023,7 @@ int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1063,6 +1078,7 @@ int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
int error;
GLdouble answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1117,6 +1133,7 @@ int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1171,6 +1188,7 @@ int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1225,6 +1243,7 @@ int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1279,6 +1298,7 @@ int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1333,6 +1353,7 @@ int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1389,6 +1410,7 @@ int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1501,6 +1523,7 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
int error;
GLboolean answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1534,6 +1557,7 @@ int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
GLsizei n;
__GLXcontext *cx;
int error;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1561,6 +1585,7 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
int error;
GLuint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1622,6 +1647,7 @@ int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1676,6 +1702,7 @@ int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1730,6 +1757,7 @@ int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1784,6 +1812,7 @@ int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1838,6 +1867,7 @@ int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1892,6 +1922,7 @@ int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1946,6 +1977,7 @@ int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
int error;
GLfloat answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -2000,6 +2032,7 @@ int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
int error;
GLint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -2054,6 +2087,7 @@ int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
int error;
GLboolean answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
@@ -2087,6 +2121,7 @@ int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
GLsizei n;
__GLXcontext *cx;
int error;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
@@ -2114,6 +2149,7 @@ int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
int error;
GLuint answerBuffer[200];
char *answer;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
diff --git a/GL/glx/global.c b/GL/glx/global.c
index 9cd011ec9..73c2e8f3f 100644
--- a/GL/glx/global.c
+++ b/GL/glx/global.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxbuf.c b/GL/glx/glxbuf.c
index 6e6f6142b..3488476c9 100644
--- a/GL/glx/glxbuf.c
+++ b/GL/glx/glxbuf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxbuf.h b/GL/glx/glxbuf.h
index a298b3471..611602f38 100644
--- a/GL/glx/glxbuf.h
+++ b/GL/glx/glxbuf.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxbuf_h_
#define _glxbuf_h_
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 57c064d19..df4154991 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.13 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index 2c7773b86..8c0f1f091 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.12 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.10 2004/01/28 18:11:50 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -190,6 +190,7 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
CARD32 buf[__GLX_TOTAL_CONFIG];
unsigned int screen;
int i, p;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&req->screen);
@@ -404,6 +405,7 @@ void glxSwapQueryExtensionsStringReply(ClientPtr client,
xGLXQueryExtensionsStringReply *reply, char *buf)
{
int length = reply->length;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
@@ -430,6 +432,7 @@ void glxSwapQueryServerStringReply(ClientPtr client,
void __glXSwapQueryContextInfoEXTReply(ClientPtr client, xGLXQueryContextInfoEXTReply *reply, int *buf)
{
int length = reply->length;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h
index 6454b4952..5eb72177e 100644
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
#ifndef _GLX_context_h_
#define _GLX_context_h_
diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h
index a2c806f44..972a6045f 100644
--- a/GL/glx/glxdrawable.h
+++ b/GL/glx/glxdrawable.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
#ifndef _GLX_drawable_h_
#define _GLX_drawable_h_
diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h
index 3c1e93c61..5aad9c3e7 100644
--- a/GL/glx/glxerror.h
+++ b/GL/glx/glxerror.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _GLX_error_h_
#define _GLX_error_h_
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index ac08c3df9..796663e9b 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.10 2004/01/28 22:36:05 alanh Exp $
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $
** The contents of this file are subject to the GLX Public License Version 1.0
** (the "License"). You may not use this file except in compliance with the
** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h
index fb0d21b85..210fbb88c 100644
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.8 2004/02/09 23:46:31 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */
#ifndef _glxext_h_
#define _glxext_h_
diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c
index 4ce952d51..789eda52b 100644
--- a/GL/glx/glxfb.c
+++ b/GL/glx/glxfb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxfb.h b/GL/glx/glxfb.h
index 44a72a3e2..a0011a9ce 100644
--- a/GL/glx/glxfb.h
+++ b/GL/glx/glxfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxfb_h_
#define _glxfb_h_
diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c
index 7ec1134cd..b38456f6f 100644
--- a/GL/glx/glximports.c
+++ b/GL/glx/glximports.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glximports.h b/GL/glx/glximports.h
index e1a65a70e..09d8340af 100644
--- a/GL/glx/glximports.h
+++ b/GL/glx/glximports.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
#ifndef _glximports_h_
#define _glximports_h_
diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c
index 0c3ea25a7..a38909922 100644
--- a/GL/glx/glxmem.c
+++ b/GL/glx/glxmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxmem.h b/GL/glx/glxmem.h
index 93a277559..889046721 100644
--- a/GL/glx/glxmem.h
+++ b/GL/glx/glxmem.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxmem_h_
#define _glxmem_h_
diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c
index b21d4ade9..cca2105ba 100644
--- a/GL/glx/glxpix.c
+++ b/GL/glx/glxpix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxpix.h b/GL/glx/glxpix.h
index d7a9afab0..2147a6d03 100644
--- a/GL/glx/glxpix.h
+++ b/GL/glx/glxpix.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxpix_h_
#define _glxpix_h_
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 1a64b0e19..f78b4a284 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxscreens.h b/GL/glx/glxscreens.h
index 99f76dc38..42dc66e08 100644
--- a/GL/glx/glxscreens.h
+++ b/GL/glx/glxscreens.h
@@ -1,7 +1,7 @@
#ifndef _GLX_screens_h_
#define _GLX_screens_h_
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index 9446aefcc..be9e40f5a 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.6 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _GLX_server_h_
#define _GLX_server_h_
diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c
index ebc9a2bfc..7aafd0065 100644
--- a/GL/glx/glxutil.c
+++ b/GL/glx/glxutil.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h
index 1f736f0f1..67bfb06f9 100644
--- a/GL/glx/glxutil.h
+++ b/GL/glx/glxutil.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
#ifndef _glxcmds_h_
#define _glxcmds_h_
diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h
index 322ee18c8..894391003 100644
--- a/GL/glx/impsize.h
+++ b/GL/glx/impsize.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _impsize_h_
#define _impsize_h_
diff --git a/GL/glx/render2.c b/GL/glx/render2.c
index 56453ceff..d4c523fea 100644
--- a/GL/glx/render2.c
+++ b/GL/glx/render2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.8 2004/02/03 23:04:08 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c
index c60da90dc..7c94b5268 100644
--- a/GL/glx/render2swap.c
+++ b/GL/glx/render2swap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.8 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.6 2002/01/14 22:47:08 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -48,6 +48,7 @@ void __glXDispSwap_Map1f(GLbyte *pc)
GLfloat u1, u2, *points;
GLenum target;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -79,6 +80,7 @@ void __glXDispSwap_Map2f(GLbyte *pc)
GLfloat u1, u2, v1, v2, *points;
GLenum target;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -118,6 +120,7 @@ void __glXDispSwap_Map1d(GLbyte *pc)
GLint order, k, compsize;
GLenum target;
GLdouble u1, u2, *points;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_DOUBLE(pc + 0);
@@ -161,6 +164,7 @@ void __glXDispSwap_Map2d(GLbyte *pc)
GLdouble u1, u2, v1, v2, *points;
GLint uorder, vorder, ustride, vstride, k, compsize;
GLenum target;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_DOUBLE(pc + 0);
@@ -211,6 +215,7 @@ void __glXDispSwap_CallLists(GLbyte *pc)
{
GLenum type;
GLsizei n;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c
index ad5625dd6..5ffa47ddb 100644
--- a/GL/glx/renderpix.c
+++ b/GL/glx/renderpix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c
index 3b0e1f6b7..81d4e375f 100644
--- a/GL/glx/renderpixswap.c
+++ b/GL/glx/renderpixswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c
index e73135db3..aa784b5fc 100644
--- a/GL/glx/rensize.c
+++ b/GL/glx/rensize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.7 2004/01/28 18:11:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c
index 04ffff6bc..f402bb217 100644
--- a/GL/glx/rensizetab.c
+++ b/GL/glx/rensizetab.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.6 2004/02/03 23:04:08 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/single2.c b/GL/glx/single2.c
index f690ce928..5869e8f50 100644
--- a/GL/glx/single2.c
+++ b/GL/glx/single2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.10 2004/03/04 19:22:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c
index 49fcfe9a5..c8c496871 100644
--- a/GL/glx/single2swap.c
+++ b/GL/glx/single2swap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.9 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -115,6 +115,7 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
GLint nitems=0, retBytes=0, retval, newModeCheck;
GLubyte *retBuffer = NULL;
GLenum newMode;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
int error;
@@ -270,6 +271,7 @@ int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc)
ClientPtr client = cl->client;
int error;
GLdouble answer[4];
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c
index 85be77d85..4459d81b1 100644
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c
index 2b488312e..b4370a229 100644
--- a/GL/glx/singlepixswap.c
+++ b/GL/glx/singlepixswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/singlesize.c b/GL/glx/singlesize.c
index 3f3054871..448fa1aef 100644
--- a/GL/glx/singlesize.c
+++ b/GL/glx/singlesize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.8 2004/02/09 19:51:32 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.7tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h
index 829338094..15941ec4b 100644
--- a/GL/glx/singlesize.h
+++ b/GL/glx/singlesize.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
#ifndef _singlesize_h_
#define _singlesize_h_
diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h
index 5a2d10ee9..6984b45ab 100644
--- a/GL/glx/unpack.h
+++ b/GL/glx/unpack.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.6 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */
#ifndef __GLX_unpack_h__
#define __GLX_unpack_h__
@@ -146,9 +146,8 @@ extern xGLXSingleReply __glXReply;
#define __GLX_DECLARE_SWAP_VARIABLES \
GLbyte sw
-#define __GLX_DECLARE_SWAP_ARRAY_VARIABLES \
- __GLX_DECLARE_SWAP_VARIABLES; \
- GLbyte *swapPC; \
+#define __GLX_DECLARE_SWAP_ARRAY_VARIABLES \
+ GLbyte *swapPC; \
GLbyte *swapEnd
diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c
index 3ea767d2b..cb87d552d 100644
--- a/GL/glx/xfont.c
+++ b/GL/glx/xfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h
index c50288055..c10cf4b64 100644
--- a/GL/include/GL/glx_ansic.h
+++ b/GL/include/GL/glx_ansic.h
@@ -1,7 +1,7 @@
#ifndef _glx_ansic_h_
#define _glx_ansic_h_
-/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h
index 7a467b9b5..08e2a9f6c 100644
--- a/GL/include/GL/xf86glx.h
+++ b/GL/include/GL/xf86glx.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c
index 170726bff..240705989 100644
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index d09b2120a..efc9bf1d2 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c
index 435ca71f6..cab6d5e11 100644
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991, 1992 by
diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c
index db06e1cc2..3c9385794 100644
--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
diff --git a/Xext/EVI.c b/Xext/EVI.c
index 09aa03b64..820312cca 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h
index dfe4423f8..db5655f97 100644
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */
#ifndef EVI_STRUCT_H
#define EVI_STRUCT_H
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 8718e3630..1c05b815f 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */
/*
Copyright 1996, 1998, 2001 The Open Group
diff --git a/Xext/appgroup.h b/Xext/appgroup.h
index d292cf509..05c9ef124 100644
--- a/Xext/appgroup.h
+++ b/Xext/appgroup.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */
+/* $XFree86$ */
void XagClientStateChange(
CallbackListPtr* pcbl,
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index ae73783d9..893fe9d13 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */
#define NEED_EVENTS
#include "X.h"
diff --git a/Xext/cup.c b/Xext/cup.c
index 70c6fa610..d5475d3d8 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 9d3df8798..e04f3470d 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -33,7 +33,7 @@ Equipment Corporation.
* @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00
*/
-/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.12 2004/02/17 15:30:23 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index b8260491e..36ad391da 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */
/* Prototypes for functions that the DDX must provide */
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index bc85c16ca..24086084a 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */
typedef int Bool;
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 7c3f5a800..2b7798f29 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -27,7 +27,7 @@
*
* Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
*/
-/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index 4308037be..be08abea7 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index 99400c90a..3e6f9dc20 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c
index 9c531c292..6c3e8be6b 100644
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index b911d7ff5..8fd6c3646 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 89a8a2d2e..d9e36d47e 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index d01b0b854..bc88c8b89 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -1,25 +1,34 @@
/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
-/****************************************************************
-* *
-* Copyright (c) Digital Equipment Corporation, 1991, 1997 *
-* *
-* All Rights Reserved. Unpublished rights reserved under *
-* the copyright laws of the United States. *
-* *
-* The software contained on this media is proprietary to *
-* and embodies the confidential technology of Digital *
-* Equipment Corporation. Possession, use, duplication or *
-* dissemination of the software and media is authorized only *
-* pursuant to a valid written license from Digital Equipment *
-* Corporation. *
-* *
-* RESTRICTED RIGHTS LEGEND Use, duplication, or disclosure *
-* by the U.S. Government is subject to restrictions as set *
-* forth in Subparagraph (c)(1)(ii) of DFARS 252.227-7013, *
-* or in FAR 52.227-19, as applicable. *
-* *
-*****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
+/* $XdotOrg$ */
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index e3ea803e6..b73827150 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */
#include <stdio.h>
#include "X.h"
diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h
index d15fc8002..9da5876fd 100644
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */
/*
* Server dispatcher function replacements
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 73a441a88..6c76a309f 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -26,7 +26,7 @@ Equipment Corporation.
/* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */
#include <stdio.h>
#include "X.h"
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 27cbcda52..1d187bc27 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */
#ifndef _PANORAMIXSRV_H_
#define _PANORAMIXSRV_H_
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index 15ed9401c..4f23ca383 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 1b96932e2..4b783fd5e 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
*
@@ -27,7 +28,7 @@ in this Software without prior written authorization from the X Consortium.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.9 2004/03/02 19:43:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
@@ -810,7 +811,7 @@ ScreenSaverSetAttributes (ClientPtr client)
DepthPtr pDepth;
WindowOptPtr ancwopt;
unsigned long *pVlist;
- unsigned long *values = 0, *save = 0;
+ unsigned long *values = 0;
unsigned long tmask, imask;
unsigned long val;
Pixmap pixID;
@@ -938,7 +939,6 @@ ScreenSaverSetAttributes (ClientPtr client)
ret = BadAlloc;
goto bail;
}
- save = values;
pAttr->screen = pScreen;
pAttr->client = client;
pAttr->x = stuff->x;
@@ -1167,7 +1167,7 @@ PatchUp:
bail:
CheckScreenPrivate (pScreen);
xfree (pAttr);
- xfree (save);
+ xfree (values);
return ret;
}
diff --git a/Xext/security.c b/Xext/security.c
index f8e96afad..b46733823 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
/*
@@ -24,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
#include "dixstruct.h"
#include "extnsionst.h"
diff --git a/Xext/shape.c b/Xext/shape.c
index 956a8ebfc..8f5c3dba0 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/shm.c b/Xext/shm.c
index b81ff5b22..29eab06f5 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index afde19cba..891522431 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */
/* dixsleep.c - implement millisecond timeouts for X clients */
diff --git a/Xext/sync.c b/Xext/sync.c
index 25d360bfa..62636a0c7 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index b31057a0d..7c9348c0f 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 1da665af0..dec2c181e 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */
/*
* BIGFONT extension for sharing font metrics between clients (if possible)
* and for transmitting font metrics to clients in a compressed form.
diff --git a/Xext/xprint.c b/Xext/xprint.c
index e50fb4068..96e2ca078 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -64,7 +64,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */
#define _XP_PRINT_SERVER_
#include "X.h"
diff --git a/Xext/xres.c b/Xext/xres.c
index 28e926642..4f0f9e297 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -1,7 +1,8 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.9 2004/03/04 19:31:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
+/* $XdotOrg$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 89bcae3a4..3635b3898 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
@@ -26,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */
#include "X.h"
#define NEED_EVENTS
diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c
index 41c78d9c9..96e680832 100644
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.6 2003/10/28 23:08:44 tsi Exp $ */
/***************************************************************
* include files
diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h
index 6e258080e..60663dfb9 100644
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c
index 539d14e30..516b7b3c0 100644
--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
* File: xtest1di.c
@@ -52,7 +53,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.5 2003/09/13 21:33:03 dawes Exp $ */
/*****************************************************************************
* include files
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 40313470c..f98168c99 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -21,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */
/*
** File:
diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h
index 342a874e8..00af9858b 100644
--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@@ -1,3 +1,3 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */
+/* $XFree86$ */
extern void XineramifyXv(void);
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8dafa8b26..d4bff69ad 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */
#ifndef XVDIX_H
#define XVDIX_H
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 2c3f484bd..e95bbe390 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -21,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */
/*
** File:
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index cb6c06301..c892c9567 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index b589c5487..6b39d1356 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */
#ifndef _XVMC_H
#define _XVMC_H
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 2eb463d41..cca0caaef 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/allowev.h b/Xi/allowev.h
index 0202b2cf5..40c9a30c8 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index f5988d76b..91761a39d 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 0d15001a0..a7e1c3b24 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 213fc7bf5..d00bf5392 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index 4f833617a..cadf27fb4 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index b0b82ee6d..1aef44045 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */
/***********************************************************************
*
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 5a2cef2c7..a878f1393 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 2b638252f..7d411f181 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index fd7ed4673..199285263 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 96ce0bebe..7d1e14171 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
index 9df05b4d0..e9cb56a47 100644
--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index c6ece1d65..0fce98473 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.6 2001/08/23 14:56:19 alanh Exp $ */
/***********************************************************************
*
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
index 3168e9710..adf50b0bd 100644
--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 1f7e7dbd2..71eb04332 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.3 2001/08/23 14:56:19 alanh Exp $ */
/***********************************************************************
*
diff --git a/Xi/closedev.h b/Xi/closedev.h
index 0295b2c8f..882d81f14 100644
--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 98520ec1c..6d3fcce53 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/devbell.h b/Xi/devbell.h
index bbf6dea92..8ceafa629 100644
--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index d2b2fb58c..ec07f443a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.10 2001/12/14 19:58:55 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index f07618b84..6f397a2d0 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.2 1996/05/06 05:56:03 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 01d51ba64..60fd885ca 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.6 2001/12/14 19:58:55 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index fb22a1422..febfa0293 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
index 999a7c9f9..f1e300191 100644
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 5b24bffbe..e7a3a8050 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
index 0318b4387..5092bb4c6 100644
--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 59c2c122b..94f1bc4a1 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
index 6ba96b066..fe799244a 100644
--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 2b916da11..e29b54ad6 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
index d3df5ba5f..0ae139714 100644
--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 4a7a7e296..cd9d00c43 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
index ebd02f3ef..b0dfb9f8e 100644
--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 67e36b442..5fe62fcce 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
index ff317e0c4..deeb28fdd 100644
--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getprop.c b/Xi/getprop.c
index a3f3226ea..88655322f 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */
/***********************************************************************
*
diff --git a/Xi/getprop.h b/Xi/getprop.h
index 452875bd9..b75dc515b 100644
--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 75b9137a6..61ee1091d 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.5 2001/10/28 03:32:53 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xi/getselev.h b/Xi/getselev.h
index 5ed759c29..0929de6fd 100644
--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getvers.c b/Xi/getvers.c
index c220b5a81..638548e60 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 2304c6639..c93359f99 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 80f948de5..565d4d19d 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
index 1eddd24ac..8a2e8fb39 100644
--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index cbc4fd8bd..e4a3dfd30 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
index 8782c12ac..c1a02de58 100644
--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index d7481801b..6366884ba 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
index eb8db9511..cf25e861f 100644
--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 1ddcca3ae..f22785fd4 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.6 2001/10/28 03:32:53 tsi Exp $ */
/***********************************************************************
*
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
index 7d85e566e..a4739db38 100644
--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/listdev.c b/Xi/listdev.c
index ac4c875a1..f95d60d25 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.3 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/listdev.h b/Xi/listdev.h
index c9553b692..04518e528 100644
--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 26210fa86..c2a07aaff 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/opendev.h b/Xi/opendev.h
index 818e2d877..b5608792d 100644
--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 598ab85ae..240c3a610 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.4 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/queryst.h b/Xi/queryst.h
index 50d36e95e..051192228 100644
--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/selectev.c b/Xi/selectev.c
index a46a02928..11f206cc8 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/selectev.h b/Xi/selectev.h
index 2327b94c5..e2fa17623 100644
--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index ae6f8cdc6..aa9146176 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
index c2ace5804..0f935addc 100644
--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 52553948d..cc7c0fbb2 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
index 77f097104..36584767e 100644
--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setdval.c b/Xi/setdval.c
index fe2e13853..2704775ae 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/setdval.h b/Xi/setdval.h
index e6f08a64c..65ccb4504 100644
--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index 599934549..6e57ad268 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
index 1da6927b4..db2dc1b61 100644
--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 4c4d19c8b..7af5e1037 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/********************************************************************
*
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
index 30fb57b48..fd2710488 100644
--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 9c3feb4db..2eff821e7 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/setmode.h b/Xi/setmode.h
index 63a1dd35b..e05fb7633 100644
--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 879d8e9b7..d1b9f285c 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.4 2001/12/14 19:58:59 dawes Exp $ */
/*
* stubs.c -- stub routines for the X server side of the XINPUT
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index a1ab911fe..7a3c680bc 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
index 9a036901f..96d2662e1 100644
--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 66ccc72af..a03979dcf 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
index 500b77ebb..2f7899c31 100644
--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index d7632db2a..2bf25248c 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */
/***********************************************************************
*
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
index c43575ba1..275ec446d 100644
--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/XpConfig/C/print/Xprinters b/XpConfig/C/print/Xprinters
index 9290636fb..a32c02dc2 100644
--- a/XpConfig/C/print/Xprinters
+++ b/XpConfig/C/print/Xprinters
@@ -29,6 +29,13 @@
#Augment_Printer_List %none%
########################################################################
+# Preconfigured entry for the PSspooldir model
+# (which sends jobs to /tmp/Xprintjobs instead to a physical printer)
+########################################################################
+#Printer xp_pdf_spooldir_tmp_Xprintjobs
+Printer xp_ps_spooldir_tmp_Xprintjobs
+
+########################################################################
# Add individual printers to the list of printers managed by the
# server. These are aliases, determined by driver name.
########################################################################
@@ -40,4 +47,3 @@
# Printer xppclpr
# Printer xppclmonopr
# Printer xprasterpr
-
diff --git a/XpConfig/C/print/attributes/document b/XpConfig/C/print/attributes/document
index e0be64553..039fade82 100644
--- a/XpConfig/C/print/attributes/document
+++ b/XpConfig/C/print/attributes/document
@@ -21,9 +21,17 @@
*copy-count: 1
*default-medium: iso-a4
*default-printer-resolution: 300
-*document-format: {Postscript 2}
-*plex: duplex
+# "PSspooldir" jobs should always be 300 DPI
+# (to be compatible to DPS-based PostScript viewers such as sdtimage)
+PSspooldir.default-printer-resolution: 300
+
+# "PS2PDFspooldir-GS" jobs should always be 600 DPI
+PS2PDFspooldir-GS.default-printer-resolution: 600
+
+# Some resolution defaults to make applications happy which are too lazy
+# to pick an own default in absence of "default-printer-resolution"
+HPLJ4050-PS.default-printer-resolution: 600
# EXAMPLES
#
diff --git a/XpConfig/C/print/attributes/printer b/XpConfig/C/print/attributes/printer
index a49afa5f0..41e13b44b 100644
--- a/XpConfig/C/print/attributes/printer
+++ b/XpConfig/C/print/attributes/printer
@@ -16,8 +16,24 @@
# Set this attribute for all printers.
# Example: "*.document-formats-ready: {pcl 5}"
+# Remove this line and replace them with per printer settings
+# if you want to use more than one DDX!!
+*xp-model-identifier: PSdefault
-*xp-ddx-identifier: XP-POSTSCRIPT
+
+# Sample entry for the "PSspooldir" model
+# Just add a printer called "xp_ps_spooldir_tmp_Xprintjobs" to "Xprinters"
+# and you will get an extra printer which files the PostScript jobs
+# in the "/tmp/Xprintjobs/" directory.
+xp_ps_spooldir_tmp_Xprintjobs.xp-model-identifier: PSspooldir
+
+# Sample entry for the "PS2PDFspooldir-GS" model
+# Just add a printer called "xp_pdf_spooldir_tmp_Xprintjobs" to "Xprinters"
+# and you will get an extra printer which convertes the PostScript jobs
+# to PDF using "ps2pdf" and files them into the "/tmp/Xprintjobs/" directory.
+# NOTE: Future versions of Xprint will use the PDF DDX instead directly
+# instead of relying on GhostScript/ps2pdf...
+xp_pdf_spooldir_tmp_Xprintjobs.xp-model-identifier: PS2PDFspooldir-GS
# IMPORTANT EXAMPLES
diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/model-config b/XpConfig/C/print/models/CANONBJ10E-GS/model-config
new file mode 100644
index 000000000..97bfd8196
--- /dev/null
+++ b/XpConfig/C/print/models/CANONBJ10E-GS/model-config
@@ -0,0 +1,23 @@
+# $Xprint.org: CANONBJ10E-GS model-config,v 1.4 2003/02/10 14:48:04 gisburn Exp $
+
+*content-orientations-supported: portrait landscape
+*descriptor: Canon BJ-10e (GhostScript)
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+}
+
+*plexes-supported: simplex
+*printer-model: "Canon BJ-10e (GhostScript)"
+*printer-resolutions-supported: 360
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/C/print/models/GSdefault/model-config b/XpConfig/C/print/models/GSdefault/model-config
new file mode 100644
index 000000000..61dac18b8
--- /dev/null
+++ b/XpConfig/C/print/models/GSdefault/model-config
@@ -0,0 +1,137 @@
+# $Xprint.org: GSdefault model-config,v 1.1 2003/02/10 14:48:04 gisburn Exp $
+# Generic default model-config for the PostScript DDX when using GhostScript
+# as printer driver
+#
+# DO NOT MODIFY THIS FILE!!
+#
+# If you want to make customisations for your printer create a copy
+# of this printer model.
+# Example (for creating a model config "MYCOMPANYlaserxx"):
+# 1. Create model config dir:
+# % mkdir MYCOMPANYlaserxx
+# 2. Link (or copy) the PMF (printer font metrics) for the
+# printer buildin fonts:
+# % ln -s GSdefault/fonts MYCOMPANYlaserxx/.
+# 3. Copy the model config file:
+# % cp GSdefault/model-config MYCOMPANYlaserxx/.
+# 4. Customize MYCOMPANYlaserxx/model-config to match your needs.
+#
+
+# Attributes supported for this printer model
+# You may want to cut the lists here down to the attributes supported
+# by your printer.
+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
+*descriptor: GhostScript default model
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+ {executive FALSE {6.35 177.80 6.35 260.35}}\
+ {folio FALSE {6.35 204.47 6.35 323.85}}\
+ {invoice FALSE {6.35 133.35 6.35 209.55}}\
+ {ledger FALSE {6.35 273.05 6.35 425.45}}\
+ {quarto FALSE {6.35 209.55 6.35 268.732}}\
+ {a FALSE {6.35 209.55 6.35 273.05}}\
+ {b FALSE {6.35 273.05 6.35 425.45}}\
+ {c FALSE {6.35 425.45 6.35 552.45}}\
+ {d FALSE {6.35 552.45 6.35 857.25}}\
+ {e FALSE {6.35 857.25 6.35 1111.25}}\
+ {na-6x9-envelope FALSE {6.35 146.05 6.35 222.25}}\
+ {na-10x15-envelope FALSE {6.35 247.65 6.35 374.65}}\
+ {monarch-envelope FALSE {6.35 91.948 6.35 184.15}}\
+ {na-10x13-envelope FALSE {6.35 247.65 6.35 323.85}}\
+ {na-9x12-envelope FALSE {6.35 222.25 6.35 298.45}}\
+ {na-number-10-envelope FALSE {6.35 98.425 6.35 234.95}}\
+ {na-7x9-envelope FALSE {6.35 171.45 6.35 222.25}}\
+ {na-9x11-envelope FALSE {6.35 222.25 6.35 273.05}}\
+ {na-10x14-envelope FALSE {6.35 247.65 6.35 349.25}}\
+ {na-number-9-envelope FALSE {6.35 92.075 6.35 219.075}}\
+ {iso-a0 FALSE {6.35 834.65 6.35 1182.65}}\
+ {iso-a1 FALSE {6.35 587.65 6.35 834.65}}\
+ {iso-a2 FALSE {6.35 413.65 6.35 587.65}}\
+ {iso-a3 FALSE {6.35 290.65 6.35 413.65}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {iso-a5 FALSE {6.35 141.65 6.35 203.65}}\
+ {iso-a6 FALSE {6.35 98.65 6.35 141.65}}\
+ {iso-a7 FALSE {6.35 67.65 6.35 98.65}}\
+ {iso-a8 FALSE {6.35 45.65 6.35 67.65}}\
+ {iso-a9 FALSE {6.35 30.65 6.35 45.65}}\
+ {iso-a10 FALSE {6.35 19.65 6.35 30.65}}\
+ {iso-b1 FALSE {6.35 700.65 6.35 993.65}}\
+ {iso-b2 FALSE {6.35 493.65 6.35 700.65}}\
+ {iso-b3 FALSE {6.35 346.65 6.35 493.65}}\
+ {iso-b4 FALSE {6.35 243.65 6.35 346.65}}\
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {iso-b6 FALSE {6.35 118.65 6.35 169.65}}\
+ {iso-b7 FALSE {6.35 81.65 6.35 118.65}}\
+ {iso-b8 FALSE {6.35 55.65 6.35 81.65}}\
+ {iso-b9 FALSE {6.35 37.65 6.35 55.65}}\
+ {iso-b10 FALSE {6.35 24.65 6.35 37.65}}\
+ {jis-b1 FALSE {6.35 721.65 6.35 1023.65}}\
+ {jis-b2 FALSE {6.35 508.65 6.35 721.65}}\
+ {jis-b3 FALSE {6.35 357.65 6.35 508.65}}\
+ {jis-b4 FALSE {6.35 250.65 6.35 357.65}}\
+ {jis-b5 FALSE {6.35 175.65 6.35 250.65}}\
+ {jis-b6 FALSE {6.35 121.65 6.35 175.65}}\
+ {jis-b7 FALSE {6.35 84.65 6.35 121.65}}\
+ {jis-b8 FALSE {6.35 57.65 6.35 84.65}}\
+ {jis-b9 FALSE {6.35 38.65 6.35 57.65}}\
+ {jis-b10 FALSE {6.35 25.65 6.35 38.65}}\
+ {iso-c3 FALSE {6.35 317.65 6.35 451.65}}\
+ {iso-c4 FALSE {6.35 222.65 6.35 317.65}}\
+ {iso-c5 FALSE {6.35 155.65 6.35 222.65}}\
+ {iso-c6 FALSE {6.35 107.65 6.35 155.65}}\
+ {iso-designated-long FALSE {6.35 103.65 6.35 213.65}}\
+ {hp-2x-postcard FALSE {6.35 141.65 6.35 193.65}}\
+ {hp-european-edp FALSE {6.35 298.45 6.35 349.25}}\
+ {hp-mini FALSE {6.35 133.35 6.35 209.55}}\
+ {hp-postcard FALSE {6.35 93.65 6.35 141.65}}\
+ {hp-tabloid FALSE {6.35 273.05 6.35 425.45}}\
+ {hp-us-edp FALSE {6.35 273.05 6.35 349.25}}\
+ {hp-us-government-legal FALSE {6.35 196.85 6.35 323.85}}\
+ {hp-us-government-letter FALSE {6.35 196.85 6.35 247.65}}\
+}
+# If you have more than one tray use the following example:
+# 1. List the supported trays
+#*input-trays-supported: main manual
+# 2. Define each tray and it's paper sizes
+#*medium-source-sizes-supported: \
+#{ main \
+# {na-letter FALSE {6.35 209.55 6.35 273.05}} \
+# {na-legal FALSE {6.35 209.55 6.35 349.25}} \
+# {iso-a4 FALSE {6.35 203.65 6.35 290.65}} \
+#} \
+#{ manual \
+# {iso-a5 FALSE {6.35 141.65 6.35 203.65}} \
+# {iso-c5 FALSE {6.35 155.65 6.35 222.65}} \
+# {iso-designated-long FALSE {6.35 103.65 6.35 213.65}} \
+# {jis-b5 FALSE {6.35 175.65 6.35 250.65}} \
+# {monarch-envelope FALSE {6.35 91.948 6.35 184.15}} \
+# {na-legal FALSE {6.35 209.55 6.35 349.25}} \
+# {na-number-10-envelope FALSE {6.35 98.425 6.35 234.95}} \
+# {executive FALSE {6.35 177.8 6.35 260.35}} \
+# {iso-a3 FALSE {6.35 290.65 6.35 413.65}} \
+# {iso-a0 FALSE {6.35 834.65 6.35 1182.65}} \
+#}
+*plexes-supported: simplex duplex tumble
+*printer-model: "GhostScript default model"
+# 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
+# 940, 1200 and 2440 are supported DPI values, we limit it here
+# to some common values:
+*printer-resolutions-supported: 300 360 400 600
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+
+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
+# xp-psddx-download-fonts defines which fonts should be downloaded as outlines
+# (valid types are "pfa", "pfb", "ttf", "ttc", "otf", "otc")
+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
+# xp-psddx-download-font-type defines which font type is used to download outlines
+# (valid values are "bitmap", "pstype1" and "pstype3")
+*xp-psddx-download-font-type: pstype1
+# EOF.
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias b/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
index 1499aa845..e69de29bb 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
+++ b/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
@@ -1 +0,0 @@
-! So the file isn't empty
diff --git a/XpConfig/C/print/models/HPDJ1600C/model-config b/XpConfig/C/print/models/HPDJ1600C/model-config
index f3bd8af3a..5d45d4495 100644
--- a/XpConfig/C/print/models/HPDJ1600C/model-config
+++ b/XpConfig/C/print/models/HPDJ1600C/model-config
@@ -1,28 +1,16 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
+# $Xprint.org: HPDJ1600C model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
# This is the configuration file for the HP DeskJet 1600C printer.
#
# The CDEnext SI supports two 1600C drivers XP-PCL-MONO and
# XP-PCL-COLOR, which work with this configuration file.
#
-# Attribute IDs must be qualified using either the printer-model
-# identifier or an asterisk ('*'). For example, if "HPDJ1600C" is the
-# printer-model, then to initialize the 'plexes-supported' attribute
-# to 'simplex', use: "HPDJ1600C.plexes-supported: simplex". For the
-# asterisk, use: "*.plexes-supported: simplex". If the same attribute
-# is specified using each method, the printer-model qualified entry
-# takes precedence.
-
-HPDJ1600C.printer-model: "Hewlett-Packard DeskJet 1600C"
-HPDJ1600C.printer-resolutions-supported: 300
-HPDJ1600C.content-orientations-supported: portrait landscape
-HPDJ1600C.document-formats-supported: {PCL 5} {PostScript 2}
-HPDJ1600C.plexes-supported: simplex duplex
-HPDJ1600C.xp-ddx-identifier: XP-PCL-COLOR
-HPDJ1600C.xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
-HPDJ1600C.xp-setup-proviso: setup-optional
+*content-orientations-supported: portrait landscape
+*descriptor: Hewlett-Packard DeskJet 1600C
+*document-formats-supported: {PCL 5} {PostScript 2}
+*input-trays-supported:
# 1/4" unprintable margins
-HPDJ1600C.medium-source-sizes-supported:\
+*medium-source-sizes-supported:\
{ '' \
{na-letter FALSE {6.35 209.55 6.35 273.05}}\
{executive FALSE {6.35 177.75 6.35 260.35}}\
@@ -41,4 +29,12 @@ HPDJ1600C.medium-source-sizes-supported:\
{hp-japanese-postcard FALSE {6 94 6 142 }}\
{hp-japanese-doublepostcard FALSE {6 142 6 194 }}\
}
-
+*plexes-supported: simplex duplex
+*printer-model: "Hewlett-Packard DeskJet 1600C"
+*printer-resolutions-supported: 300
+*xp-ddx-identifier: XP-PCL-COLOR
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
+*xp-raw-formats-supported: { PCL 5 }
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/model-config b/XpConfig/C/print/models/HPLJ4050-PS/model-config
new file mode 100644
index 000000000..159206de2
--- /dev/null
+++ b/XpConfig/C/print/models/HPLJ4050-PS/model-config
@@ -0,0 +1,36 @@
+# $Xprint.org: HPLJ4050-PS model-config,v 1.1 2003/12/16 00:48:04 gisburn Exp $
+# model-config for the HP LaserJet 4050 PostScript printer series
+#
+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
+*descriptor: Hewlett-Packard LaserJet 4050 PostScript printer
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+ {executive FALSE {6.35 177.80 6.35 260.35}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {iso-a5 FALSE {6.35 141.65 6.35 203.65}}\
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {jis-b5 FALSE {6.35 175.65 6.35 250.65}}\
+}
+
+# Duplex unit is optional for HPLJ4050 series
+*plexes-supported: simplex
+*printer-model: "Hewlett-Packard LaserJet 4050 PostScript printer"
+*printer-resolutions-supported: 600 1200
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+
+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
+# xp-psddx-download-fonts defines which fonts should be downloaded as outlines
+# (valid types are "pfa", "pfb", "ttf", "ttc", "otf", "otc")
+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
+# xp-psddx-download-font-type defines which font type is used to download outlines
+# (valid values are "bitmap", "pstype1" and "pstype3")
+*xp-psddx-download-font-type: pstype1
+# EOF.
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias b/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
index 1499aa845..e69de29bb 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
+++ b/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
@@ -1 +0,0 @@
-! So the file isn't empty
diff --git a/XpConfig/C/print/models/HPLJ4family/model-config b/XpConfig/C/print/models/HPLJ4family/model-config
index f69e25718..1ac997ebe 100644
--- a/XpConfig/C/print/models/HPLJ4family/model-config
+++ b/XpConfig/C/print/models/HPLJ4family/model-config
@@ -1,28 +1,15 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
+# $Xprint.org: HPLJ4family model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
# This is the configuration file for the HP LaserJet 4 Printers.
#
# Though not a deliverable for the CDEnext SI, the XP-PCL-MONO
# driver should be able to support the LaserJet 4 printers.
#
-# Attribute IDs must be qualified using either the printer-model
-# identifier or an asterisk ('*'). For example, if "HPLJ4family" is the
-# printer-model, then to initialize the 'plexes-supported' attribute
-# to 'simplex', use: "HPLJ4family.plexes-supported: simplex". For the
-# asterisk, use: "*.plexes-supported: simplex". If the same attribute
-# is specified using each method, the printer-model qualified entry
-# takes precedence.
-
-HPLJ4family.printer-model: "Hewlett-Packard LaserJet 4 Series"
-HPLJ4family.printer-resolutions-supported: 300 600
-HPLJ4family.content-orientations-supported: portrait landscape
-HPLJ4family.document-formats-supported: {PCL 5} {PostScript 2}
-HPLJ4family.plexes-supported: simplex duplex
-HPLJ4family.xp-ddx-identifier: XP-PCL-MONO
-HPLJ4family.xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
-HPLJ4family.xp-setup-proviso: setup-optional
-
+*content-orientations-supported: portrait landscape
+*descriptor: Hewlett-Packard LaserJet 4 Series
+*document-formats-supported: {PCL 5} {PostScript 2}
+*input-trays-supported:
# 1/4" unprintable margins
-HPLJ4family.medium-source-sizes-supported:\
+*medium-source-sizes-supported:\
{ '' \
{na-letter FALSE {6.35 209.55 6.35 273.05}}\
{executive FALSE {6.35 177.75 6.35 260.35}}\
@@ -41,4 +28,12 @@ HPLJ4family.medium-source-sizes-supported:\
{hp-japanese-postcard FALSE {6 94 6 142 }}\
{hp-japanese-doublepostcard FALSE {6 142 6 194 }}\
}
-
+*plexes-supported: simplex duplex
+*printer-model: "Hewlett-Packard LaserJet 4 Series"
+*printer-resolutions-supported: 300 600
+*xp-ddx-identifier: XP-PCL-MONO
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
+*xp-raw-formats-supported: { PCL 5 }
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config b/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config
new file mode 100644
index 000000000..1d74b8676
--- /dev/null
+++ b/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config
@@ -0,0 +1,72 @@
+# $Xprint.org: PS2PDFspooldir-GS model-config,v 1.1 2003/11/20 03:48:04 gisburn Exp $
+# PostScript DDX model-config which converts jobs to PDF via GhostScript's "ps2pdf"
+# and then sends them to a spool dir instead to a print queue
+#
+# This model is basically a cut-down GSdefault model with a custom *xp-spooler-command
+#
+# DO NOT MODIFY THIS FILE!!
+#
+# If you want to make customisations for your printer create a copy
+# of this printer model.
+# Example (for creating a model config "MYCOMPANYlaserxx"):
+# 1. Create model config dir:
+# % mkdir MYCOMPANYlaserxx
+# 2. Link (or copy) the PMF (printer font metrics) for the
+# printer buildin fonts:
+# % ln -s PS2PDFspooldir-GS/fonts MYCOMPANYlaserxx/.
+# 3. Copy the model config file:
+# % cp PS2PDFspooldir-GS/model-config MYCOMPANYlaserxx/.
+# 4. Customize MYCOMPANYlaserxx/model-config to match your needs.
+#
+# Attributes supported for this printer model
+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
+*descriptor: PDF job spool dir /tmp/Xprintjobs
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+ {executive FALSE {6.35 177.80 6.35 260.35}}\
+ {ledger FALSE {6.35 273.05 6.35 425.45}}\
+ {quarto FALSE {6.35 209.55 6.35 268.732}}\
+ {iso-a3 FALSE {6.35 290.65 6.35 413.65}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {iso-a5 FALSE {6.35 141.65 6.35 203.65}}\
+ {iso-b3 FALSE {6.35 346.65 6.35 493.65}}\
+ {iso-b4 FALSE {6.35 243.65 6.35 346.65}}\
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {jis-b3 FALSE {6.35 357.65 6.35 508.65}}\
+ {jis-b4 FALSE {6.35 250.65 6.35 357.65}}\
+ {jis-b5 FALSE {6.35 175.65 6.35 250.65}}\
+ {iso-c3 FALSE {6.35 317.65 6.35 451.65}}\
+ {iso-c4 FALSE {6.35 222.65 6.35 317.65}}\
+ {iso-c5 FALSE {6.35 155.65 6.35 222.65}}\
+}
+
+*plexes-supported: simplex duplex tumble
+*printer-model: "PDF job spool dir /tmp/Xprintjobs"
+# 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
+# 940, 1200 and 2440 are supported DPI values, we limit it here
+# to some common values:
+*printer-resolutions-supported: 300 360 400 600
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+
+# Use custom spooler script which sends the output to a dir instead to a printer queue
+# Note that "%xpconfigdir%" is currently only supported in Xprt servers build
+# from xprint.mozdev.org sources, other platforms have replace it with the
+# absolute path name to the script
+*xp-spooler-command: %xpconfigdir%/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -d /tmp/Xprintjobs -s .pdf -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
+
+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
+# xp-psddx-download-fonts defines which fonts should be downloaded as outlines
+# (valid types are "pfa", "pfb", "ttf", "ttc", "otf", "otc")
+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
+# xp-psddx-download-font-type defines which font type is used to download outlines
+# (valid values are "bitmap", "pstype1" and "pstype3")
+*xp-psddx-download-font-type: pstype1
+# EOF.
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh b/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
new file mode 100755
index 000000000..5739807d8
--- /dev/null
+++ b/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
@@ -0,0 +1,130 @@
+#!/bin/sh
+PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin
+export PATH
+
+verbose_msgs="false"
+DEFAULT_SPOOLDIR=/tmp/Xprintjobs
+
+usage()
+{
+ printf "Usage: ${0}: [options]\n"
+ printf "-v\tbe verbose\n"
+ printf "-d dirname\tdefine spool dir\n"
+ printf "-p string\tname of printer selected by user\n"
+ printf "-c integer\tnumber of copies\n"
+ printf "-t string\tjob title\n"
+ printf "-s string\tfile name suffix\n"
+ printf "-o string\tspooler options\n"
+ printf "-u mask\tpermission mask for new files (see umask)\n"
+ exit 2
+}
+
+verbose()
+{
+ if ${verbose_msgs} ; then
+ echo "$1"
+ fi
+}
+
+spooldir="${DEFAULT_SPOOLDIR}"
+printername=
+num_job_copies=
+job_title=
+filename_suffix=
+spooler_options=
+permmask=
+while getopts va:b:d:p:c:t:s:o:u: i
+do
+ case $i in
+ v)
+ verbose_msgs="true"
+ ;;
+ d)
+ spooldir="$OPTARG"
+ ;;
+ p)
+ printername="$OPTARG"
+ ;;
+ c)
+ num_job_copies="$OPTARG"
+ ;;
+ t)
+ job_title="$OPTARG"
+ ;;
+ s)
+ filename_suffix="$OPTARG"
+ ;;
+ o)
+ spooler_options="$OPTARG"
+ ;;
+ u)
+ permmask="$OPTARG"
+ ;;
+ ?) usage
+ ;;
+ esac
+done
+
+verbose "# spooldir=\"$spooldir\""
+verbose "# printername=\"$printername\""
+verbose "# num_job_copies=\"$num_job_copies\""
+verbose "# job_title=\"$job_title\""
+verbose "# spooler_options=\"$spooler_options\""
+verbose "# umask=\"$permmask\""
+
+if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then
+ mkdir "${DEFAULT_SPOOLDIR}"
+ chmod a+rwxt "${DEFAULT_SPOOLDIR}"
+fi
+
+if [ "${permmask}" != "" ] ; then
+ umask ${permmask}
+fi
+
+if [ ! -d "$spooldir" ] ; then
+ echo "$0: spooldir \"$spooldir\" does not exits." >&2
+ exit 1
+fi
+if [ ! -w "$spooldir" ] ; then
+ echo "$0: Cannot write to spooldir \"$spooldir\"." >&2
+ exit 1
+fi
+
+# Create first part of the output file name (prefix and an "unique"
+# id(=date and time))...
+filename="Xpjob_`date +%Y%m%d%H%M%S`"
+
+# ... then add options ...
+if [ "${printername}" != "" ] ; then
+ filename="${filename}_${printername}"
+fi
+if [ "${num_job_copies}" != "" -a "${num_job_copies}" != "1" ] ; then
+ filename="${filename}_copies_${num_job_copies}"
+fi
+if [ "${job_title}" != "" ] ; then
+ filename="${filename}_title_${job_title}"
+fi
+
+# ... mangle output file name and filter chars (like whitespaces)
+# which may screw-up further processing by other shell scripts ...
+filename="`echo \"${filename}\" | tr '[:blank:]' '_' | tr -c -d '[:alnum:]_.-'`"
+
+# ... add path and suffix ...
+filename="${spooldir}/${filename}${filename_suffix}"
+
+verbose "# File name is \"$filename\"."
+
+# ... and finally capture stdin to the file (we are using "gs" directly to
+# avoid the problem that "ps2pdf" is not available in all Linux
+# distributions by default).
+#ps2pdf - - | cat >"${filename}"
+gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=-" -dCompatibilityLevel=1.2 -c .setpdfwrite -f - | cat >"${filename}"
+
+if ${verbose_msgs} ; then
+ printf "# File is " ; ls -l "${filename}"
+fi
+
+verbose "# Done."
+
+exit 0
+# EOF.
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
new file mode 100644
index 000000000..331178985
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
new file mode 100644
index 000000000..61bcb22b9
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
new file mode 100644
index 000000000..88ccf0834
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf
new file mode 100644
index 000000000..45cc8857b
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf b/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf
new file mode 100644
index 000000000..ac760fdb9
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf
new file mode 100644
index 000000000..8db974018
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf
new file mode 100644
index 000000000..87aee16cc
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf b/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf
new file mode 100644
index 000000000..6109c8c11
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf
new file mode 100644
index 000000000..30d462d95
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf
new file mode 100644
index 000000000..89619516f
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf
new file mode 100644
index 000000000..2a0de8afc
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf b/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf
new file mode 100644
index 000000000..b1fd475bb
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf
new file mode 100644
index 000000000..aff4b4949
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
new file mode 100644
index 000000000..b5b77f353
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
new file mode 100644
index 000000000..100339854
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
new file mode 100644
index 000000000..a8550e70d
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
new file mode 100644
index 000000000..ab22aabf5
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
new file mode 100644
index 000000000..e68811eb7
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
new file mode 100644
index 000000000..390f223cb
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
new file mode 100644
index 000000000..655b9b6c0
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
new file mode 100644
index 000000000..5e786ec42
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf
new file mode 100644
index 000000000..094b348cc
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf
new file mode 100644
index 000000000..0bb62bde6
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf
new file mode 100644
index 000000000..3c19a7fbf
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf b/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf
new file mode 100644
index 000000000..48925f816
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf b/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf
new file mode 100644
index 000000000..cf46ca03f
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf b/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
new file mode 100644
index 000000000..ffe51af80
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf b/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf
new file mode 100644
index 000000000..865433f83
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf b/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf
new file mode 100644
index 000000000..625e0c43f
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf b/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
new file mode 100644
index 000000000..1ae9a7688
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
Binary files differ
diff --git a/XpConfig/C/print/models/PSdefault/model-config b/XpConfig/C/print/models/PSdefault/model-config
new file mode 100644
index 000000000..05a19d859
--- /dev/null
+++ b/XpConfig/C/print/models/PSdefault/model-config
@@ -0,0 +1,136 @@
+# $Xprint.org: PSdefault model-config,v 1.2 2002/11/07 19:48:04 gisburn Exp $
+# Generic default model-config for the PostScript DDX
+#
+# DO NOT MODIFY THIS FILE!!
+#
+# If you want to make customisations for your printer create a copy
+# of this printer model.
+# Example (for creating a model config "MYCOMPANYlaserxx"):
+# 1. Create model config dir:
+# % mkdir MYCOMPANYlaserxx
+# 2. Link (or copy) the PMF (printer font metrics) for the
+# printer buildin fonts:
+# % ln -s PSdefault/fonts MYCOMPANYlaserxx/.
+# 3. Copy the model config file:
+# % cp PSdefault/model-config MYCOMPANYlaserxx/.
+# 4. Customize MYCOMPANYlaserxx/model-config to match your needs.
+#
+
+# Attributes supported for this printer model
+# You may want to cut the lists here down to the attributes supported
+# by your printer.
+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
+*descriptor: PostScript default model
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+ {executive FALSE {6.35 177.80 6.35 260.35}}\
+ {folio FALSE {6.35 204.47 6.35 323.85}}\
+ {invoice FALSE {6.35 133.35 6.35 209.55}}\
+ {ledger FALSE {6.35 273.05 6.35 425.45}}\
+ {quarto FALSE {6.35 209.55 6.35 268.732}}\
+ {a FALSE {6.35 209.55 6.35 273.05}}\
+ {b FALSE {6.35 273.05 6.35 425.45}}\
+ {c FALSE {6.35 425.45 6.35 552.45}}\
+ {d FALSE {6.35 552.45 6.35 857.25}}\
+ {e FALSE {6.35 857.25 6.35 1111.25}}\
+ {na-6x9-envelope FALSE {6.35 146.05 6.35 222.25}}\
+ {na-10x15-envelope FALSE {6.35 247.65 6.35 374.65}}\
+ {monarch-envelope FALSE {6.35 91.948 6.35 184.15}}\
+ {na-10x13-envelope FALSE {6.35 247.65 6.35 323.85}}\
+ {na-9x12-envelope FALSE {6.35 222.25 6.35 298.45}}\
+ {na-number-10-envelope FALSE {6.35 98.425 6.35 234.95}}\
+ {na-7x9-envelope FALSE {6.35 171.45 6.35 222.25}}\
+ {na-9x11-envelope FALSE {6.35 222.25 6.35 273.05}}\
+ {na-10x14-envelope FALSE {6.35 247.65 6.35 349.25}}\
+ {na-number-9-envelope FALSE {6.35 92.075 6.35 219.075}}\
+ {iso-a0 FALSE {6.35 834.65 6.35 1182.65}}\
+ {iso-a1 FALSE {6.35 587.65 6.35 834.65}}\
+ {iso-a2 FALSE {6.35 413.65 6.35 587.65}}\
+ {iso-a3 FALSE {6.35 290.65 6.35 413.65}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {iso-a5 FALSE {6.35 141.65 6.35 203.65}}\
+ {iso-a6 FALSE {6.35 98.65 6.35 141.65}}\
+ {iso-a7 FALSE {6.35 67.65 6.35 98.65}}\
+ {iso-a8 FALSE {6.35 45.65 6.35 67.65}}\
+ {iso-a9 FALSE {6.35 30.65 6.35 45.65}}\
+ {iso-a10 FALSE {6.35 19.65 6.35 30.65}}\
+ {iso-b1 FALSE {6.35 700.65 6.35 993.65}}\
+ {iso-b2 FALSE {6.35 493.65 6.35 700.65}}\
+ {iso-b3 FALSE {6.35 346.65 6.35 493.65}}\
+ {iso-b4 FALSE {6.35 243.65 6.35 346.65}}\
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {iso-b6 FALSE {6.35 118.65 6.35 169.65}}\
+ {iso-b7 FALSE {6.35 81.65 6.35 118.65}}\
+ {iso-b8 FALSE {6.35 55.65 6.35 81.65}}\
+ {iso-b9 FALSE {6.35 37.65 6.35 55.65}}\
+ {iso-b10 FALSE {6.35 24.65 6.35 37.65}}\
+ {jis-b1 FALSE {6.35 721.65 6.35 1023.65}}\
+ {jis-b2 FALSE {6.35 508.65 6.35 721.65}}\
+ {jis-b3 FALSE {6.35 357.65 6.35 508.65}}\
+ {jis-b4 FALSE {6.35 250.65 6.35 357.65}}\
+ {jis-b5 FALSE {6.35 175.65 6.35 250.65}}\
+ {jis-b6 FALSE {6.35 121.65 6.35 175.65}}\
+ {jis-b7 FALSE {6.35 84.65 6.35 121.65}}\
+ {jis-b8 FALSE {6.35 57.65 6.35 84.65}}\
+ {jis-b9 FALSE {6.35 38.65 6.35 57.65}}\
+ {jis-b10 FALSE {6.35 25.65 6.35 38.65}}\
+ {iso-c3 FALSE {6.35 317.65 6.35 451.65}}\
+ {iso-c4 FALSE {6.35 222.65 6.35 317.65}}\
+ {iso-c5 FALSE {6.35 155.65 6.35 222.65}}\
+ {iso-c6 FALSE {6.35 107.65 6.35 155.65}}\
+ {iso-designated-long FALSE {6.35 103.65 6.35 213.65}}\
+ {hp-2x-postcard FALSE {6.35 141.65 6.35 193.65}}\
+ {hp-european-edp FALSE {6.35 298.45 6.35 349.25}}\
+ {hp-mini FALSE {6.35 133.35 6.35 209.55}}\
+ {hp-postcard FALSE {6.35 93.65 6.35 141.65}}\
+ {hp-tabloid FALSE {6.35 273.05 6.35 425.45}}\
+ {hp-us-edp FALSE {6.35 273.05 6.35 349.25}}\
+ {hp-us-government-legal FALSE {6.35 196.85 6.35 323.85}}\
+ {hp-us-government-letter FALSE {6.35 196.85 6.35 247.65}}\
+}
+# If you have more than one tray use the following example:
+# 1. List the supported trays
+#*input-trays-supported: main manual
+# 2. Define each tray and it's paper sizes
+#*medium-source-sizes-supported: \
+#{ main \
+# {na-letter FALSE {6.35 209.55 6.35 273.05}} \
+# {na-legal FALSE {6.35 209.55 6.35 349.25}} \
+# {iso-a4 FALSE {6.35 203.65 6.35 290.65}} \
+#} \
+#{ manual \
+# {iso-a5 FALSE {6.35 141.65 6.35 203.65}} \
+# {iso-c5 FALSE {6.35 155.65 6.35 222.65}} \
+# {iso-designated-long FALSE {6.35 103.65 6.35 213.65}} \
+# {jis-b5 FALSE {6.35 175.65 6.35 250.65}} \
+# {monarch-envelope FALSE {6.35 91.948 6.35 184.15}} \
+# {na-legal FALSE {6.35 209.55 6.35 349.25}} \
+# {na-number-10-envelope FALSE {6.35 98.425 6.35 234.95}} \
+# {executive FALSE {6.35 177.8 6.35 260.35}} \
+# {iso-a3 FALSE {6.35 290.65 6.35 413.65}} \
+# {iso-a0 FALSE {6.35 834.65 6.35 1182.65}} \
+#}
+*plexes-supported: simplex duplex tumble
+*printer-model: "PostScript default model"
+# 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
+# 940, 1200 and 2440 are supported DPI values, we limit it here
+# to some common values:
+*printer-resolutions-supported: 300 360 400 600
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+
+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
+# xp-psddx-download-fonts defines which fonts should be downloaded as outlines
+# (valid types are "pfa", "pfb", "ttf", "ttc", "otf", "otc")
+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
+# xp-psddx-download-font-type defines which font type is used to download outlines
+# (valid values are "bitmap", "pstype1" and "pstype3")
+*xp-psddx-download-font-type: pstype1
+# EOF.
diff --git a/XpConfig/C/print/models/PSspooldir/model-config b/XpConfig/C/print/models/PSspooldir/model-config
new file mode 100644
index 000000000..6bb477767
--- /dev/null
+++ b/XpConfig/C/print/models/PSspooldir/model-config
@@ -0,0 +1,71 @@
+# $Xprint.org: PSspooldir model-config,v 1.1 2002/11/25 19:48:04 gisburn Exp $
+# PostScript DDX model-config which sends jobs to a spool dir instead to a print queue
+#
+# This model is basically a cut-down PSdefault model with a custom *xp-spooler-command
+#
+# DO NOT MODIFY THIS FILE!!
+#
+# If you want to make customisations for your printer create a copy
+# of this printer model.
+# Example (for creating a model config "MYCOMPANYlaserxx"):
+# 1. Create model config dir:
+# % mkdir MYCOMPANYlaserxx
+# 2. Link (or copy) the PMF (printer font metrics) for the
+# printer buildin fonts:
+# % ln -s PSspooldir/fonts MYCOMPANYlaserxx/.
+# 3. Copy the model config file:
+# % cp PSspooldir/model-config MYCOMPANYlaserxx/.
+# 4. Customize MYCOMPANYlaserxx/model-config to match your needs.
+#
+# Attributes supported for this printer model
+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
+*descriptor: PostScript job spool dir /tmp/Xprintjobs
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
+{ '' \
+ {na-letter FALSE {6.35 209.55 6.35 273.05}}\
+ {na-legal FALSE {6.35 209.55 6.35 349.25}}\
+ {executive FALSE {6.35 177.80 6.35 260.35}}\
+ {ledger FALSE {6.35 273.05 6.35 425.45}}\
+ {quarto FALSE {6.35 209.55 6.35 268.732}}\
+ {iso-a3 FALSE {6.35 290.65 6.35 413.65}}\
+ {iso-a4 FALSE {6.35 203.65 6.35 290.65}}\
+ {iso-a5 FALSE {6.35 141.65 6.35 203.65}}\
+ {iso-b3 FALSE {6.35 346.65 6.35 493.65}}\
+ {iso-b4 FALSE {6.35 243.65 6.35 346.65}}\
+ {iso-b5 FALSE {6.35 169.65 6.35 243.65}}\
+ {jis-b3 FALSE {6.35 357.65 6.35 508.65}}\
+ {jis-b4 FALSE {6.35 250.65 6.35 357.65}}\
+ {jis-b5 FALSE {6.35 175.65 6.35 250.65}}\
+ {iso-c3 FALSE {6.35 317.65 6.35 451.65}}\
+ {iso-c4 FALSE {6.35 222.65 6.35 317.65}}\
+ {iso-c5 FALSE {6.35 155.65 6.35 222.65}}\
+}
+
+*plexes-supported: simplex duplex tumble
+*printer-model: "PostScript job spool dir /tmp/Xprintjobs"
+# 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
+# 940, 1200 and 2440 are supported DPI values, we limit it here
+# to some common values:
+*printer-resolutions-supported: 300 360 400 600
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+
+# Use custom spooler script which sends the output to a dir instead to a printer queue
+# Note that "%xpconfigdir%" is currently only supported in Xprt servers build
+# from xprint.mozdev.org sources, other platforms have replace it with the
+# absolute path name to the script
+*xp-spooler-command: %xpconfigdir%/C/print/models/PSspooldir/spooltodir.sh -d /tmp/Xprintjobs -s .ps -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
+
+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
+# xp-psddx-download-fonts defines which fonts should be downloaded as outlines
+# (valid types are "pfa", "pfb", "ttf", "ttc", "otf", "otc")
+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
+# xp-psddx-download-font-type defines which font type is used to download outlines
+# (valid values are "bitmap", "pstype1" and "pstype3")
+*xp-psddx-download-font-type: pstype1
+# EOF.
diff --git a/XpConfig/C/print/models/PSspooldir/spooltodir.sh b/XpConfig/C/print/models/PSspooldir/spooltodir.sh
new file mode 100755
index 000000000..aba14e1b3
--- /dev/null
+++ b/XpConfig/C/print/models/PSspooldir/spooltodir.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+PATH=/usr/bin:/usr/sbin:/bin:/sbin
+export PATH
+
+verbose_msgs="false"
+DEFAULT_SPOOLDIR=/tmp/Xprintjobs
+
+usage()
+{
+ printf "Usage: ${0}: [options]\n"
+ printf "-v\tbe verbose\n"
+ printf "-d dirname\tdefine spool dir\n"
+ printf "-p string\tname of printer selected by user\n"
+ printf "-c integer\tnumber of copies\n"
+ printf "-t string\tjob title\n"
+ printf "-s string\tfile name suffix\n"
+ printf "-o string\tspooler options\n"
+ printf "-u mask\tpermission mask for new files (see umask)\n"
+ exit 2
+}
+
+verbose()
+{
+ if ${verbose_msgs} ; then
+ echo "$1"
+ fi
+}
+
+spooldir="${DEFAULT_SPOOLDIR}"
+printername=
+num_job_copies=
+job_title=
+filename_suffix=
+spooler_options=
+permmask=
+while getopts va:b:d:p:c:t:s:o:u: i
+do
+ case $i in
+ v)
+ verbose_msgs="true"
+ ;;
+ d)
+ spooldir="$OPTARG"
+ ;;
+ p)
+ printername="$OPTARG"
+ ;;
+ c)
+ num_job_copies="$OPTARG"
+ ;;
+ t)
+ job_title="$OPTARG"
+ ;;
+ s)
+ filename_suffix="$OPTARG"
+ ;;
+ o)
+ spooler_options="$OPTARG"
+ ;;
+ u)
+ permmask="$OPTARG"
+ ;;
+ ?) usage
+ ;;
+ esac
+done
+
+verbose "# spooldir=\"$spooldir\""
+verbose "# printername=\"$printername\""
+verbose "# num_job_copies=\"$num_job_copies\""
+verbose "# job_title=\"$job_title\""
+verbose "# spooler_options=\"$spooler_options\""
+verbose "# umask=\"$permmask\""
+
+if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then
+ mkdir "${DEFAULT_SPOOLDIR}"
+ chmod a+rwxt "${DEFAULT_SPOOLDIR}"
+fi
+
+if [ "${permmask}" != "" ] ; then
+ umask ${permmask}
+fi
+
+if [ ! -d "$spooldir" ] ; then
+ echo "$0: spooldir \"$spooldir\" does not exits." >&2
+ exit 1
+fi
+if [ ! -w "$spooldir" ] ; then
+ echo "$0: Cannot write to spooldir \"$spooldir\"." >&2
+ exit 1
+fi
+
+# Create first part of the output file name (prefix and an "unique"
+# id(=date and time))...
+filename="Xpjob_`date +%Y%m%d%H%M%S`"
+
+# ... then add options ...
+if [ "${printername}" != "" ] ; then
+ filename="${filename}_${printername}"
+fi
+if [ "${num_job_copies}" != "" -a "${num_job_copies}" != "1" ] ; then
+ filename="${filename}_copies_${num_job_copies}"
+fi
+if [ "${job_title}" != "" ] ; then
+ filename="${filename}_title_${job_title}"
+fi
+
+# ... mangle output file name and filter chars (like whitespaces)
+# which may screw-up further processing by other shell scripts ...
+filename="`echo \"${filename}\" | tr '[:blank:]' '_' | tr -c -d '[:alnum:]_.-'`"
+
+# ... add path and suffix ...
+filename="${spooldir}/${filename}${filename_suffix}"
+
+verbose "# File name is \"$filename\"."
+
+# ... and finally capture stdin to the file.
+cat >"${filename}"
+
+if ${verbose_msgs} ; then
+ printf "# File is " ; ls -l "${filename}"
+fi
+
+verbose "# Done."
+
+exit 0
+# EOF.
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 4a24ac9a2..a50cb4cd9 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -22,7 +22,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
-.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.32 2004/01/12 21:43:19 herrb Exp $
+.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH XSERVER 1 __xorgversion__
diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c
index 9369db1f2..a62b33ce4 100644
--- a/hw/xfree86/dixmods/GLcoremodule.c
+++ b/hw/xfree86/dixmods/GLcoremodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -42,7 +42,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dixmods/bitmapmod.c b/hw/xfree86/dixmods/bitmapmod.c
index 27fc23d32..458cc62c9 100644
--- a/hw/xfree86/dixmods/bitmapmod.c
+++ b/hw/xfree86/dixmods/bitmapmod.c
@@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,
diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h
index a0108053c..229efa446 100644
--- a/hw/xfree86/dixmods/extmod/dgaproc.h
+++ b/hw/xfree86/dixmods/extmod/dgaproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.22 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */
#ifndef __DGAPROC_H
#define __DGAPROC_H
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index dc76cbf21..56776accf 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.17 2003/07/16 01:38:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.16 2002/03/06 21:12:33 mvojkovi Exp $ */
/*
*
@@ -213,7 +213,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index cc717c31b..6fa07c7e6 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */
#ifndef INITARGS
#define INITARGS void
diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h
index 57a7872f0..99bac9dac 100644
--- a/hw/xfree86/dixmods/extmod/vidmodeproc.h
+++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.5 2001/05/06 00:51:19 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.4 1999/12/13 01:39:40 robin Exp $ */
/* Prototypes for DGA functions that the DDX must provide */
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
index 973f54e23..4565f5860 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.22 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */
/*
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 2556743bb..5ad75258e 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -3,7 +3,7 @@
Written by Mark Vojkovich
*/
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.18 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */
#define NEED_REPLIES
diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h
index 831108399..a823e28f2 100644
--- a/hw/xfree86/dixmods/extmod/xf86dgaext.h
+++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86dgaext.h,v 1.1 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XF86DGAEXT_H_
#define _XF86DGAEXT_H_
diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h
index 208260947..3dab4277a 100644
--- a/hw/xfree86/dixmods/extmod/xf86miscproc.h
+++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.6 2003/04/03 16:15:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.5 2002/11/20 04:04:58 dawes Exp $ */
/* Prototypes for Pointer/Keyboard functions that the DDX must provide */
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index f4751a1c7..737eb4b42 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.59 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.58 2003/11/06 18:37:57 tsi Exp $ */
/*
@@ -29,6 +29,7 @@ or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY
*/
+/* $XdotOrg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 4a9c461f6..0395ba877 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */
#include "X.h"
#include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h
index 2dcbd472a..e08aef7f9 100644
--- a/hw/xfree86/dixmods/extmod/xvmodproc.h
+++ b/hw/xfree86/dixmods/extmod/xvmodproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.3 2001/04/08 16:33:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */
#include "xvmcext.h"
diff --git a/hw/xfree86/dixmods/ftmodule.c b/hw/xfree86/dixmods/ftmodule.c
index ceb5485c0..1f65cefbe 100644
--- a/hw/xfree86/dixmods/ftmodule.c
+++ b/hw/xfree86/dixmods/ftmodule.c
@@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING " & the After X-TT Project",
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
2, 1, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index f449d55ec..60624f761 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -25,7 +25,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/GL/glxmodule.c,v 1.12 2003/09/28 20:15:40 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.11 2001/06/15 21:22:38 dawes Exp $ */
/*
* Authors:
@@ -1222,7 +1222,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c
index 9c25f4c0b..868de3de4 100644
--- a/hw/xfree86/dixmods/type1mod.c
+++ b/hw/xfree86/dixmods/type1mod.c
@@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 2,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,
diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c
index 07283cdb7..f6e37b54e 100644
--- a/hw/xfree86/dixmods/xf86XTrapModule.c
+++ b/hw/xfree86/dixmods/xf86XTrapModule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/* This is the xf86 module code for the DEC_XTRAP extension.
*/
@@ -27,7 +27,7 @@ static XF86ModuleVersionInfo xtrapVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION, /* needs the server extension ABI */
ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 551a3c2a8..acef4c54b 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.40 2004/01/30 14:31:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 80602d3dd..149534417 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c
index bb7a89ee0..9410a3200 100644
--- a/hw/xfree86/dri/drimodule.c
+++ b/hw/xfree86/dri/drimodule.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/**************************************************************************
Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -24,7 +25,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/GL/dri/drimodule.c,v 1.6 2001/12/10 19:07:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.5 2001/06/15 21:22:39 dawes Exp $ */
/*
* Authors:
@@ -43,7 +44,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h
index e733ac210..6d90d770a 100644
--- a/hw/xfree86/dri/dristruct.h
+++ b/hw/xfree86/dri/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h
index fcb4b59bd..d4d83df93 100644
--- a/hw/xfree86/dri/sarea.h
+++ b/hw/xfree86/dri/sarea.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
/**
* \file sarea.h
* SAREA definitions.
@@ -34,7 +34,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
#ifndef _SAREA_H_
#define _SAREA_H_
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 3df0cca59..bc8a17ad2 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.13 2003/09/24 02:43:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.12 2002/12/14 01:36:08 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c
index 7519b35c3..481374d53 100644
--- a/hw/xfree86/x86emu/debug.c
+++ b/hw/xfree86/x86emu/debug.c
@@ -36,7 +36,7 @@
* emulator.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.2 2000/04/05 18:13:14 dawes Exp $ */
#include "x86emu/x86emui.h"
#ifdef IN_MODULE
diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index b9eb1ad79..45a1a4b4c 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -37,7 +37,8 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
+/* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/fpu.c b/hw/xfree86/x86emu/fpu.c
index 0f679bde6..4b801dc94 100644
--- a/hw/xfree86/x86emu/fpu.c
+++ b/hw/xfree86/x86emu/fpu.c
@@ -36,7 +36,7 @@
* emulation of the FPU instructions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/fpu.c,v 1.2 2003/10/22 20:03:06 tsi Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 94041f6c8..88ee7e108 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -70,7 +70,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.9 2003/10/22 20:03:06 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.8tsi Exp $ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c
index 47c49ad52..7cb585bc8 100644
--- a/hw/xfree86/x86emu/ops2.c
+++ b/hw/xfree86/x86emu/ops2.c
@@ -37,7 +37,7 @@
* instructions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.7 2004/02/06 17:15:28 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.6tsi Exp $ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
index d493ae837..39941360d 100644
--- a/hw/xfree86/x86emu/sys.c
+++ b/hw/xfree86/x86emu/sys.c
@@ -39,7 +39,7 @@
* user library.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.7 2002/12/24 17:42:58 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.6 2002/09/16 18:05:18 eich Exp $ */
#include "x86emu.h"
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/x86emu.h b/hw/xfree86/x86emu/x86emu.h
index de989b83f..1df9ac50d 100644
--- a/hw/xfree86/x86emu/x86emu.h
+++ b/hw/xfree86/x86emu/x86emu.h
@@ -37,7 +37,7 @@
* include this header
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu.h,v 1.3 2002/09/16 18:05:17 eich Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_X86EMU_H
#define __X86EMU_X86EMU_H
diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h
index 56221cbba..8abedf616 100644
--- a/hw/xfree86/x86emu/x86emu/debug.h
+++ b/hw/xfree86/x86emu/x86emu/debug.h
@@ -35,7 +35,7 @@
* Description: Header file for debug definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.4 2000/11/21 23:10:27 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */
#ifndef __X86EMU_DEBUG_H
#define __X86EMU_DEBUG_H
diff --git a/hw/xfree86/x86emu/x86emu/decode.h b/hw/xfree86/x86emu/x86emu/decode.h
index d134f4294..bb2bc0bee 100644
--- a/hw/xfree86/x86emu/x86emu/decode.h
+++ b/hw/xfree86/x86emu/x86emu/decode.h
@@ -35,7 +35,7 @@
* Description: Header file for instruction decoding logic.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/decode.h,v 1.3 2002/07/23 01:51:03 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_DECODE_H
#define __X86EMU_DECODE_H
diff --git a/hw/xfree86/x86emu/x86emu/fpu_regs.h b/hw/xfree86/x86emu/x86emu/fpu_regs.h
index b975b87e0..a125075b7 100644
--- a/hw/xfree86/x86emu/x86emu/fpu_regs.h
+++ b/hw/xfree86/x86emu/x86emu/fpu_regs.h
@@ -35,7 +35,7 @@
* Description: Header file for FPU register definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.3 2003/10/28 16:01:40 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.2 2003/10/22 20:03:05 tsi Exp $ */
#ifndef __X86EMU_FPU_REGS_H
#define __X86EMU_FPU_REGS_H
diff --git a/hw/xfree86/x86emu/x86emu/prim_asm.h b/hw/xfree86/x86emu/x86emu/prim_asm.h
index 4fa8d5503..041255f18 100644
--- a/hw/xfree86/x86emu/x86emu/prim_asm.h
+++ b/hw/xfree86/x86emu/x86emu/prim_asm.h
@@ -39,7 +39,7 @@
* platform.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_PRIM_ASM_H
#define __X86EMU_PRIM_ASM_H
diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h
index 3a4580138..fba2991d4 100644
--- a/hw/xfree86/x86emu/x86emu/regs.h
+++ b/hw/xfree86/x86emu/x86emu/regs.h
@@ -35,7 +35,7 @@
* Description: Header file for x86 register definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.6 2003/10/28 16:01:40 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.5 2003/10/22 20:03:05 tsi Exp $ */
#ifndef __X86EMU_REGS_H
#define __X86EMU_REGS_H
diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
index 3a0dc17fc..5232d10ac 100644
--- a/hw/xfree86/x86emu/x86emu/types.h
+++ b/hw/xfree86/x86emu/x86emu/types.h
@@ -36,7 +36,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.7 2003/07/07 15:34:21 eich Exp $ */
+/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.6 2003/06/12 14:12:26 eich Exp $ */
#ifndef __X86EMU_TYPES_H
#define __X86EMU_TYPES_H
@@ -76,7 +76,7 @@
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64)) || \
- defined(__AMD64__) || defined(AMD64) || \
+ defined(__amd64__) || defined(amd64) || \
(defined(__sgi) && (_MIPS_SZLONG == 64))
#define NUM32 int
#else
diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h
index 9cdb0a1b3..3adf61ec6 100644
--- a/hw/xfree86/x86emu/x86emu/x86emui.h
+++ b/hw/xfree86/x86emu/x86emu/x86emui.h
@@ -38,7 +38,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.4 2001/04/01 13:59:58 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.3 2000/04/17 16:29:47 eich Exp $ */
#ifndef __X86EMU_X86EMUI_H
#define __X86EMU_X86EMUI_H
diff --git a/os/strlcat.c b/os/strlcat.c
index cda5c6ab9..7031de3a6 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -15,7 +15,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 14e45ef8c..71657da69 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -15,7 +15,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#include <string.h>
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 5bc7f65fc..a6fec50f5 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 209631e72..6aa41d06e 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 20def46ba..d1fd14f27 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 06660ff89..afc0dbebd 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/maprules.c b/xkb/maprules.c
index c588ae399..330f9fe90 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c
index 0e480b4df..34470ea77 100644
--- a/xkb/xkbconfig.c
+++ b/xkb/xkbconfig.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c
index d12467ff7..351a8dac5 100644
--- a/xkb/xkberrs.c
+++ b/xkb/xkberrs.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 2a6d836aa..1b83041ee 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index d688aca01..3e81d64ef 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index fc593e796..027642af6 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b7a08e267..cd38cbb32 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */
#include <stdio.h>