From 0664db19bf37f9dd69cca6adff4e238e310c3092 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:54:16 +0000 Subject: [PATCH] Merging XORG-CURRENT into trunk --- GL/apple/aglGlx.c | 2 +- GL/apple/indirect.c | 2 +- GL/glx/g_disptab.c | 2 +- GL/glx/g_disptab.h | 2 +- GL/glx/g_disptab_EXT.c | 2 +- GL/glx/g_disptab_EXT.h | 2 +- GL/glx/g_render.c | 40 +++-- GL/glx/g_renderswap.c | 115 ++++++++++++++- GL/glx/g_single.c | 2 +- GL/glx/g_singleswap.c | 38 ++++- GL/glx/global.c | 2 +- GL/glx/glxbuf.c | 2 +- GL/glx/glxbuf.h | 2 +- GL/glx/glxcmds.c | 2 +- GL/glx/glxcmdsswap.c | 5 +- GL/glx/glxcontext.h | 2 +- GL/glx/glxdrawable.h | 2 +- GL/glx/glxerror.h | 2 +- GL/glx/glxext.c | 2 +- GL/glx/glxext.h | 2 +- GL/glx/glxfb.c | 2 +- GL/glx/glxfb.h | 2 +- GL/glx/glximports.c | 2 +- GL/glx/glximports.h | 2 +- GL/glx/glxmem.c | 2 +- GL/glx/glxmem.h | 2 +- GL/glx/glxpix.c | 2 +- GL/glx/glxpix.h | 2 +- GL/glx/glxscreens.c | 2 +- GL/glx/glxscreens.h | 2 +- GL/glx/glxserver.h | 2 +- GL/glx/glxutil.c | 2 +- GL/glx/glxutil.h | 2 +- GL/glx/impsize.h | 2 +- GL/glx/render2.c | 2 +- GL/glx/render2swap.c | 7 +- GL/glx/renderpix.c | 2 +- GL/glx/renderpixswap.c | 2 +- GL/glx/rensize.c | 2 +- GL/glx/rensizetab.c | 2 +- GL/glx/single2.c | 2 +- GL/glx/single2swap.c | 4 +- GL/glx/singlepix.c | 2 +- GL/glx/singlepixswap.c | 2 +- GL/glx/singlesize.c | 2 +- GL/glx/singlesize.h | 2 +- GL/glx/unpack.h | 7 +- GL/glx/xfont.c | 2 +- GL/include/GL/glx_ansic.h | 2 +- GL/include/GL/xf86glx.h | 2 +- XTrap/xtrapddmi.c | 2 +- XTrap/xtrapdi.c | 3 +- XTrap/xtrapdiswp.c | 2 +- XTrap/xtrapditbl.c | 2 +- Xext/EVI.c | 2 +- Xext/EVIstruct.h | 2 +- Xext/appgroup.c | 2 +- Xext/appgroup.h | 2 +- Xext/bigreq.c | 2 +- Xext/cup.c | 2 +- Xext/dpms.c | 2 +- Xext/dpmsproc.h | 2 +- Xext/dpmsstubs.c | 2 +- Xext/fontcache.c | 2 +- Xext/mbuf.c | 2 +- Xext/mbufbf.c | 2 +- Xext/mbufpx.c | 2 +- Xext/mitmisc.c | 2 +- Xext/panoramiX.c | 2 +- Xext/panoramiX.h | 51 ++++--- Xext/panoramiXSwap.c | 2 +- Xext/panoramiXh.h | 2 +- Xext/panoramiXprocs.c | 2 +- Xext/panoramiXsrv.h | 2 +- Xext/sampleEVI.c | 2 +- Xext/saver.c | 8 +- Xext/security.c | 3 +- Xext/shape.c | 3 +- Xext/shm.c | 2 +- Xext/sleepuntil.c | 2 +- Xext/sync.c | 2 +- Xext/xcmisc.c | 2 +- Xext/xf86bigfont.c | 2 +- Xext/xprint.c | 2 +- Xext/xres.c | 3 +- Xext/xtest.c | 3 +- Xext/xtest1dd.c | 2 +- Xext/xtest1dd.h | 2 +- Xext/xtest1di.c | 3 +- Xext/xvdisp.c | 3 +- Xext/xvdisp.h | 2 +- Xext/xvdix.h | 2 +- Xext/xvmain.c | 3 +- Xext/xvmc.c | 2 +- Xext/xvmcext.h | 2 +- Xi/allowev.c | 2 +- Xi/allowev.h | 2 +- Xi/chgdctl.c | 2 +- Xi/chgdctl.h | 2 +- Xi/chgfctl.c | 2 +- Xi/chgfctl.h | 2 +- Xi/chgkbd.c | 2 +- Xi/chgkbd.h | 2 +- Xi/chgkmap.c | 2 +- Xi/chgkmap.h | 2 +- Xi/chgprop.c | 2 +- Xi/chgprop.h | 2 +- Xi/chgptr.c | 2 +- Xi/chgptr.h | 2 +- Xi/closedev.c | 2 +- Xi/closedev.h | 2 +- Xi/devbell.c | 2 +- Xi/devbell.h | 2 +- Xi/exevents.c | 2 +- Xi/exglobals.h | 2 +- Xi/extinit.c | 2 +- Xi/getbmap.c | 2 +- Xi/getbmap.h | 2 +- Xi/getdctl.c | 2 +- Xi/getdctl.h | 2 +- Xi/getfctl.c | 2 +- Xi/getfctl.h | 2 +- Xi/getfocus.c | 2 +- Xi/getfocus.h | 2 +- Xi/getkmap.c | 2 +- Xi/getkmap.h | 2 +- Xi/getmmap.c | 2 +- Xi/getmmap.h | 2 +- Xi/getprop.c | 2 +- Xi/getprop.h | 2 +- Xi/getselev.c | 2 +- Xi/getselev.h | 2 +- Xi/getvers.c | 2 +- Xi/getvers.h | 2 +- Xi/grabdev.c | 2 +- Xi/grabdev.h | 2 +- Xi/grabdevb.c | 2 +- Xi/grabdevb.h | 2 +- Xi/grabdevk.c | 2 +- Xi/grabdevk.h | 2 +- Xi/gtmotion.c | 2 +- Xi/gtmotion.h | 2 +- Xi/listdev.c | 2 +- Xi/listdev.h | 2 +- Xi/opendev.c | 2 +- Xi/opendev.h | 2 +- Xi/queryst.c | 2 +- Xi/queryst.h | 2 +- Xi/selectev.c | 2 +- Xi/selectev.h | 2 +- Xi/sendexev.c | 2 +- Xi/sendexev.h | 2 +- Xi/setbmap.c | 2 +- Xi/setbmap.h | 2 +- Xi/setdval.c | 2 +- Xi/setdval.h | 2 +- Xi/setfocus.c | 2 +- Xi/setfocus.h | 2 +- Xi/setmmap.c | 2 +- Xi/setmmap.h | 2 +- Xi/setmode.c | 2 +- Xi/setmode.h | 2 +- Xi/stubs.c | 2 +- Xi/ungrdev.c | 2 +- Xi/ungrdev.h | 2 +- Xi/ungrdevb.c | 2 +- Xi/ungrdevb.h | 2 +- Xi/ungrdevk.c | 2 +- Xi/ungrdevk.h | 2 +- XpConfig/C/print/Xprinters | 8 +- XpConfig/C/print/attributes/document | 12 +- XpConfig/C/print/attributes/printer | 18 ++- .../C/print/models/CANONBJ10E-GS/model-config | 23 +++ .../C/print/models/GSdefault/model-config | 137 ++++++++++++++++++ .../print/models/HPDJ1600C/fonts/fonts.alias | 1 - .../C/print/models/HPDJ1600C/model-config | 34 ++--- .../C/print/models/HPLJ4050-PS/model-config | 36 +++++ .../models/HPLJ4family/fonts/fonts.alias | 1 - .../C/print/models/HPLJ4family/model-config | 35 ++--- .../models/PS2PDFspooldir-GS/model-config | 72 +++++++++ .../PS2PDFspooldir-GS/ps2pdf_spooltodir.sh | 130 +++++++++++++++++ .../PSdefault/fonts/AvantGarde-Book.pmf | Bin 0 -> 6716 bytes .../fonts/AvantGarde-BookOblique.pmf | Bin 0 -> 6728 bytes .../PSdefault/fonts/AvantGarde-Demi.pmf | Bin 0 -> 6712 bytes .../fonts/AvantGarde-DemiOblique.pmf | Bin 0 -> 6724 bytes .../models/PSdefault/fonts/Courier-Bold.pmf | Bin 0 -> 6612 bytes .../PSdefault/fonts/Courier-BoldOblique.pmf | Bin 0 -> 6636 bytes .../PSdefault/fonts/Courier-Oblique.pmf | Bin 0 -> 6608 bytes .../print/models/PSdefault/fonts/Courier.pmf | Bin 0 -> 6592 bytes .../models/PSdefault/fonts/Helvetica-Bold.pmf | Bin 0 -> 6680 bytes .../PSdefault/fonts/Helvetica-BoldOblique.pmf | Bin 0 -> 6692 bytes .../PSdefault/fonts/Helvetica-Oblique.pmf | Bin 0 -> 6688 bytes .../models/PSdefault/fonts/Helvetica.pmf | Bin 0 -> 6672 bytes .../PSdefault/fonts/LubalinGraph-Book.pmf | Bin 0 -> 6628 bytes .../fonts/LubalinGraph-BookOblique.pmf | Bin 0 -> 6640 bytes .../PSdefault/fonts/LubalinGraph-Demi.pmf | Bin 0 -> 6624 bytes .../fonts/LubalinGraph-DemiOblique.pmf | Bin 0 -> 6636 bytes .../PSdefault/fonts/NewCenturySchlbk-Bold.pmf | Bin 0 -> 6644 bytes .../fonts/NewCenturySchlbk-BoldItalic.pmf | Bin 0 -> 6656 bytes .../fonts/NewCenturySchlbk-Italic.pmf | Bin 0 -> 6652 bytes .../fonts/NewCenturySchlbk-Roman.pmf | Bin 0 -> 6648 bytes .../models/PSdefault/fonts/Souvenir-Demi.pmf | Bin 0 -> 6680 bytes .../PSdefault/fonts/Souvenir-DemiItalic.pmf | Bin 0 -> 6692 bytes .../models/PSdefault/fonts/Souvenir-Light.pmf | Bin 0 -> 6684 bytes .../PSdefault/fonts/Souvenir-LightItalic.pmf | Bin 0 -> 6696 bytes .../C/print/models/PSdefault/fonts/Symbol.pmf | Bin 0 -> 6556 bytes .../models/PSdefault/fonts/Times-Bold.pmf | Bin 0 -> 6660 bytes .../PSdefault/fonts/Times-BoldItalic.pmf | Bin 0 -> 6672 bytes .../models/PSdefault/fonts/Times-Italic.pmf | Bin 0 -> 6668 bytes .../models/PSdefault/fonts/Times-Roman.pmf | Bin 0 -> 6664 bytes .../models/PSdefault/fonts/ZapfDingbats.pmf | Bin 0 -> 6676 bytes .../C/print/models/PSdefault/model-config | 136 +++++++++++++++++ .../C/print/models/PSspooldir/model-config | 71 +++++++++ .../C/print/models/PSspooldir/spooltodir.sh | 127 ++++++++++++++++ doc/Xserver.man.pre | 2 +- hw/xfree86/dixmods/GLcoremodule.c | 4 +- hw/xfree86/dixmods/bitmapmod.c | 2 +- hw/xfree86/dixmods/extmod/dgaproc.h | 2 +- hw/xfree86/dixmods/extmod/modinit.c | 4 +- hw/xfree86/dixmods/extmod/modinit.h | 3 +- hw/xfree86/dixmods/extmod/vidmodeproc.h | 2 +- hw/xfree86/dixmods/extmod/xf86dga.c | 2 +- hw/xfree86/dixmods/extmod/xf86dga2.c | 2 +- hw/xfree86/dixmods/extmod/xf86dgaext.h | 2 +- hw/xfree86/dixmods/extmod/xf86miscproc.h | 2 +- hw/xfree86/dixmods/extmod/xf86vmode.c | 3 +- hw/xfree86/dixmods/extmod/xvmod.c | 2 +- hw/xfree86/dixmods/extmod/xvmodproc.h | 2 +- hw/xfree86/dixmods/ftmodule.c | 2 +- hw/xfree86/dixmods/glxmodule.c | 4 +- hw/xfree86/dixmods/type1mod.c | 2 +- hw/xfree86/dixmods/xf86XTrapModule.c | 4 +- hw/xfree86/dri/dri.c | 2 +- hw/xfree86/dri/dri.h | 2 +- hw/xfree86/dri/drimodule.c | 5 +- hw/xfree86/dri/dristruct.h | 2 +- hw/xfree86/dri/sarea.h | 4 +- hw/xfree86/dri/xf86dri.c | 2 +- hw/xfree86/x86emu/debug.c | 2 +- hw/xfree86/x86emu/decode.c | 3 +- hw/xfree86/x86emu/fpu.c | 2 +- hw/xfree86/x86emu/ops.c | 2 +- hw/xfree86/x86emu/ops2.c | 2 +- hw/xfree86/x86emu/sys.c | 2 +- hw/xfree86/x86emu/x86emu.h | 2 +- hw/xfree86/x86emu/x86emu/debug.h | 2 +- hw/xfree86/x86emu/x86emu/decode.h | 2 +- hw/xfree86/x86emu/x86emu/fpu_regs.h | 2 +- hw/xfree86/x86emu/x86emu/prim_asm.h | 2 +- hw/xfree86/x86emu/x86emu/regs.h | 2 +- hw/xfree86/x86emu/x86emu/types.h | 4 +- hw/xfree86/x86emu/x86emu/x86emui.h | 2 +- os/strlcat.c | 2 +- os/strlcpy.c | 2 +- xkb/XKBAlloc.c | 2 +- xkb/XKBGAlloc.c | 2 +- xkb/XKBMAlloc.c | 2 +- xkb/XKBMisc.c | 2 +- xkb/maprules.c | 2 +- xkb/xkbconfig.c | 2 +- xkb/xkberrs.c | 2 +- xkb/xkbfmisc.c | 2 +- xkb/xkbout.c | 2 +- xkb/xkbtext.c | 2 +- xkb/xkmread.c | 2 +- 265 files changed, 1251 insertions(+), 313 deletions(-) create mode 100644 XpConfig/C/print/models/CANONBJ10E-GS/model-config create mode 100644 XpConfig/C/print/models/GSdefault/model-config create mode 100644 XpConfig/C/print/models/HPLJ4050-PS/model-config create mode 100644 XpConfig/C/print/models/PS2PDFspooldir-GS/model-config create mode 100755 XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh create mode 100644 XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Courier.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf create mode 100644 XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf create mode 100644 XpConfig/C/print/models/PSdefault/model-config create mode 100644 XpConfig/C/print/models/PSspooldir/model-config create mode 100755 XpConfig/C/print/models/PSspooldir/spooltodir.sh 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 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 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 #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 */ -/* $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 #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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 @@ -28,6 +28,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 0000000000000000000000000000000000000000..331178985b79d55487cd9c0c1c3172c5023157a1 GIT binary patch literal 6716 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 aWGi*Dm0_VF^R+za`2~iC=^x|#_kRHdm`tt! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61bcb22b9f98b12c3453dc01d077702d55ff5277 GIT binary patch literal 6728 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 HzyJL|AK7>N literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..88ccf083450a31fa1aab778f57db30328506481e GIT binary patch literal 6712 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 WrEbT~(^IAQ{$EA^o8-Sb|NSS4V3NuJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8db974018eb4769e3b86d98f0bd9120117f7a8b7 GIT binary patch literal 6636 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87aee16cce34df1dc92957cadd6a5ecd31893099 GIT binary patch literal 6608 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..89619516f20110950dad1032c4186a59124be1de GIT binary patch literal 6692 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%0ALZQ&^?4?Pg1R zDCR09(oQ~akQVDx+#mdp|+E&?i*;}zo z<*ZY{Du1YLK(A}1_t<6abgz}(<2w^js{y35*>u)TSMpQ}8QU$T9oMGcwf5N`YS~xX z?ZBezztvbOXLFfqB{I(b0y^I+iMec{pLE4_?LvBxLAyY&>+G=$y_QSKPU|#evX<@I zrL4+ya5#wLX8P=Wwva8@^jEUEoSk?4hzm|x7k6N=IA9lW?f$GXWM{}*Y1b)`vHM-y z)}`}nR^IQFD!OnkuBx$9um`MMpKmW9mcq*G9L4-<#C#`Wezp2?_5oskK4YVaiMc9|u{cdt zhvL3;+?S5mNXJLTl0H+?XG+#EB}bX!oeA1}iz%N!<@2X%_)`JHs93&|D`$(jK~hd| z1m5LKclpv?HPT(9V%>ggXCl?!MyWJlxkXg!RloF`tQtYfH*1Z`TRIb#O}d&1+n2U| zX}d<+9u>>_Oj(~P7#cd+>I^vOes+0)f^X6B`5m9%sZr_#45MP1?7nPCjc3Oni4|YA f;>%WQWGkaWgMMpyz;O!4$+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2a0de8afc048917610bdbe10f50df24285645692 GIT binary patch literal 6688 zcmb`M3y@UhmB)YQ-sYhQC=X>6+{T!Mhs`j+@QM$bnT8o0riXb5LzLl8_hsfnzqs8E zj4@f`BckpoB&%j4F%KVESavl=O*U#arc#zkHe0N0+++(W608*EY@xwO5-jMg@4Js~ zDXUUt?X9|f|KGXiobP=9^S$oZvL#g*0|+ny*k!^l!0^jy;9V0Ue)-+8&>exOUp^$z zJRVl~WlWed5pMU(N5;UENnQoYzxG$>)dgIkepKBG#1v=*KBK^DV4VWDC^H4N0vQEv z1-_`j9$>HX@D#95`BJfe2e{yWf#(A7icQKH@-}cvKunNP3S0=1RG=5+ zUBEm6a!z@k4#q`F@;DfmDamia_yjO@Ef|dg#tmSsQ?D)rV*@b$hhU_XCNpp_i_XcvEZpY6`?}N_56o zC;D_9G_}M#yAs`for%@0UEQ6%IK}+ZrH#wN7m4V+}MVJ9;}60W{?cL#{J0Sc=X{&5kxKTiSSy z`dy-bm#N=n^P_P^WVCCjShBOlXlpK&cMEyfD%t6I(P%uAiE0nUsB0H(cZZ#x7v?1D z6r)zO+^2ZDHWr|a(~fDJC^I%#d&nb*Y|0P zHN(23SPo0^uBJqLw|>!_sNxTEyDHw~rz?yn>?2ww9eV??gf z@{9QsBcghSnhXYHr_5%oo=DC~ozycLm`#RFzU?JE&agDH9x5lfJ-{^beV&l|${Owe z9ZvHr<-hVCizyT1`cQsrc$Km&(e+-&9~kjth;fh+nWeSijFziw67PjN z6FCv;Oyn=RT`K-dYjozyxUjtwc_*~Jqz1!hDf2%%p7(t0#e9a-{Ac9@J;VHk(>z%@ zq$ki5p*+UhjL1SA+YITIgMM3(37SKF$@maoAxoqo)QL)ipCe>OsDn%r! zIE-_W)N38Z{|adh{lw)b@<3Q`B9yO?_7EfWfuG7d?4c|TbO9^5Bj_8IlQr^byv?g} zRb?+!-sdewD#!FXHis;mWI<)Q&est}IIjD!a8&c4`tu~-s1lnsPc)e#)V?1a+2K|s})EsQz{qU73zSr$!3oG@;9_kbxl!y*o&uf zQpL$}HNKe2yCD|#G3?up=k+lDPx3Hjxm@i57{@V2cvH8ro)0*zRzRR$x~0L#a5|I= zf7W=T)_NI>Kr0t2~F2Z(x`=wR|$aWkkm4`DBcq zXX-Vd;}y@GtGofslurfYvDQBmR32psYB^ubeuiaEMeP};%YZEL`&*Rf*e6RWYO^zi zR~X@?%3-}#@W$rrnzy?cW_RVW^K6&$3d1r}&$kUc&3>6(QGE>F=QJuZsN*GuWp+i) z(pU3>#t-Ot9%5J)S4QhxdpxTg&69B)mwH+?CvB9uyYh_INiyuu^ozKkVVR|UMtPC1 z`SD-C3t{{-Wsz)_S$gbTDIFocT6$%(Hy>8c@}d|Vr3Y9m8>LQm>zLQd?hv=hEg?=w zm(2*l;$zRA*L0^@x>v>77PHp0ZezwUYAx=sr#Ot*m?Xz-* zA5-?@nZ+*yTsg~$05gi;QTAh)AuGfAq({Ca4St+yc}7}fx8`Ak91Zb$`Cf=O$bM;& zJAIuOrA2PjIKsIwkA@6{bJ|w9M;d&egYtY0zOM#nHu6nGMW)-@O5S|B6BoeBXb#%8#KO93bNB5`)6db9@mQh7OB&I z)LgVmR@LC?Azm$4YoB9K{C}6SEY|s*#mfP%oaNU6W)!bemN{By3h(Q&rq_2t$EmJ0 zI!>=$&2nSdmS%~Dc%@t#wyRlYh3%TG*Zre97ix2F@Ov%*;x(LfN>k{kS*C@!P5bxw zSuRNq%VISzdGn#v>#^1-F%HWdCD;3%C>0&Ex&#B02%{Ly7{+n|7c!2E7|#SIaxs@M ziOEc1DwlE@)2QQeu3$PdxRSpi%1o}}6I{(F`4pdK7PFbdT&^L;JnETG0}EKlA{trD z5|*-z<$Q)~xsL0(ffdAANfXT^SjB2uXk`sI(#BfaNz%bOI_aXD9&Tbi8|Y;tpXFw5 zVN>P*;i8YtSoD)3jm;JY7{p;K+sKe5N1g)PaVb)w%no+4iy?01bKJ(~`2v5-?R=3t zxRblMn=f$>ySbP9xSzjcmUi{$WoBy zAlHIi53&MeB}g;KDv%bCHEKT%(hkxA(h1THaudh~kc}WWgKPrX3~D}+G{_c^L6EH= z8IT3k+*xfEv**@EpBty~(bkS~_pd|}Y0V7YcKV{a*WNFOR;6-&13 z6t_{xl#8VD*{ns@$(4)Bmy=IZ%vi<2k6h(b`Aj}X(at&^%Gkvs_V%)sVZgPmlI^m+ zY!^#TK8IEMSlfVp*Gg@(OFHO&E49rF#+L>SNI6c*aZ}|ibV8GvHb~?2onV zEAO^nqwAGwYAQLIbdZU3erFENw<0m)Dbd|RyH{h<(@%Q($r}BnuTVA1mNO-%kQpMG z_m9APJnJ6Mx~Imvr)t*gz3pyEcD7S24q9#jMZM~m-Ycud(DJIas`i##POxT{a z?OEG3)^^p*@su1-$sZb;Y<2$YcR#x{NY1M<@9F0~{d|qnysuC-OFKK9q8iV6ZzPsI g+p=d{uCXmwjfT9prNO+LW2h<*{-X)6zkdGvfBI-=rvLx| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b1fd475bba133f24cd5c0b65f60625f9f2cdefed GIT binary patch literal 6672 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aff4b494946697f5d1e21f580382898bfeefbd1a GIT binary patch literal 6628 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 O;d(`;8uAZu{`)_yHWP>d literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b5b77f353374d2e4de6f476992d60668b18de509 GIT binary patch literal 6640 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 GfBy^kGEnIN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..100339854962d18d2fc7f9db79477970a0dd47e7 GIT binary patch literal 6624 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ab22aabf5ba537eb6ba21e711af104927415cda4 GIT binary patch literal 6644 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..390f223cbf174420d2193020fdbe5487f8411f6b GIT binary patch literal 6652 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..094b348cc9cb00eaf4c09ef1a1c74f577c52a2b8 GIT binary patch literal 6692 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0bb62bde6dc6f4d13b8b774e3c7aa7716b945332 GIT binary patch literal 6684 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 K#`FK*|NbwlJ4*)u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c19a7fbfbbeffa595477fcbaf955782f4c4ecff GIT binary patch literal 6696 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 F`@ghpKu7=p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..48925f8161118ca45d4973bce56283c1cc6da5c6 GIT binary patch literal 6556 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 H4)=cmQ;R)_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cf46ca03fcfc117be4d0cce279ec6f9ca0b83222 GIT binary patch literal 6660 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 Si0Lg4dwzkD2K@uv|NbBJuaCh1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..865433f83a7224b24721a004baa04ab7cf79c3bd GIT binary patch literal 6668 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 YrEybR8VkY#<8^uUznI$f=g)ut7X+A3qW}N^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1ae9a7688e64e62b3e65be398c18a96eb3d3e286 GIT binary patch literal 6676 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 cDBDQLHd;cHVQYQN^VI&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 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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