From 4e92ef88124207e46e99d3215de66bd82372ce8e Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:32:08 +0000 Subject: [PATCH] merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- GL/apple/aglGlx.c | 2 +- GL/apple/indirect.c | 2 +- GL/glx/g_disptab.c | 14 +- GL/glx/g_disptab.h | 2 + GL/glx/g_disptab_EXT.c | 130 +- GL/glx/g_disptab_EXT.h | 42 +- GL/glx/g_render.c | 174 +- GL/glx/g_renderswap.c | 18 +- GL/glx/g_single.c | 2 +- GL/glx/g_singleswap.c | 2 +- GL/glx/global.c | 2 +- GL/glx/glxbuf.c | 2 +- GL/glx/glxbuf.h | 2 +- GL/glx/glxcmds.c | 14 +- GL/glx/glxcmdsswap.c | 17 +- GL/glx/glxcontext.h | 2 +- GL/glx/glxdrawable.h | 2 +- GL/glx/glxerror.h | 2 +- GL/glx/glxext.c | 3 + GL/glx/glxext.h | 3 + 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 | 11 +- GL/glx/glxscreens.h | 2 +- GL/glx/glxserver.h | 1 + GL/glx/glxutil.c | 2 +- GL/glx/glxutil.h | 2 +- GL/glx/impsize.h | 3 +- GL/glx/render2.c | 17 +- GL/glx/render2swap.c | 3 +- GL/glx/renderpix.c | 2 +- GL/glx/renderpixswap.c | 2 +- GL/glx/rensize.c | 8 + GL/glx/rensizetab.c | 30 +- GL/glx/single2.c | 38 +- GL/glx/single2swap.c | 53 +- GL/glx/singlepix.c | 2 +- GL/glx/singlepixswap.c | 2 +- GL/glx/singlesize.c | 257 +- GL/glx/singlesize.h | 2 +- GL/glx/unpack.h | 2 +- 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 | 5 +- 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 | 3 +- Xext/security.c | 4 +- Xext/shape.c | 3 +- Xext/shm.c | 3 +- Xext/sleepuntil.c | 2 +- Xext/sync.c | 2 +- Xext/xcmisc.c | 2 +- Xext/xf86bigfont.c | 2 +- Xext/xprint.c | 2 +- Xext/xres.c | 25 +- Xext/xtest.c | 3 +- Xext/xtest1dd.c | 2 +- Xext/xtest1dd.h | 2 +- Xext/xtest1di.c | 5 +- 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 +- Xprint/AttrValid.c | 2 +- Xprint/AttrValid.h | 2 +- Xprint/DiPrint.h | 2 +- Xprint/Init.c | 2 +- Xprint/Oid.c | 2 +- Xprint/Oid.h | 2 +- Xprint/OidStrs.h | 2 +- Xprint/Util.c | 2 +- Xprint/ValTree.c | 2 +- Xprint/attributes.c | 3 +- Xprint/attributes.h | 2 +- Xprint/ddxInit.c | 2 +- Xprint/mediaSizes.c | 2 +- Xprint/pcl/Pcl.h | 2 +- Xprint/pcl/PclArc.c | 2 +- Xprint/pcl/PclArea.c | 2 +- Xprint/pcl/PclColor.c | 2 +- Xprint/pcl/PclCursor.c | 2 +- Xprint/pcl/PclFonts.c | 2 +- Xprint/pcl/PclGC.c | 2 +- Xprint/pcl/PclInit.c | 2 +- Xprint/pcl/PclLine.c | 2 +- Xprint/pcl/PclMisc.c | 2 +- Xprint/pcl/PclPixel.c | 2 +- Xprint/pcl/PclPixmap.c | 2 +- Xprint/pcl/PclPolygon.c | 2 +- Xprint/pcl/PclPrint.c | 2 +- Xprint/pcl/PclSFonts.c | 5 +- Xprint/pcl/PclSpans.c | 2 +- Xprint/pcl/PclText.c | 2 +- Xprint/pcl/PclWindow.c | 2 +- Xprint/pcl/Pclmap.h | 2 +- Xprint/ps/Ps.h | 2 +- Xprint/ps/PsAttVal.c | 2 +- Xprint/ps/PsAttr.c | 2 +- Xprint/ps/PsColor.c | 2 +- Xprint/ps/PsFonts.c | 2 +- Xprint/ps/PsGC.c | 2 +- Xprint/ps/PsInit.c | 2 +- Xprint/ps/PsLine.c | 2 +- Xprint/ps/PsMisc.c | 2 +- Xprint/ps/PsPixel.c | 2 +- Xprint/ps/PsPixmap.c | 2 +- Xprint/ps/PsPolygon.c | 2 +- Xprint/ps/PsPrint.c | 2 +- Xprint/ps/PsSpans.c | 2 +- Xprint/ps/PsText.c | 2 +- Xprint/ps/PsWindow.c | 2 +- Xprint/ps/psout.c | 2 +- Xprint/ps/psout.h | 2 +- Xprint/raster/Raster.c | 2 +- Xprint/raster/Raster.h | 2 +- Xprint/raster/RasterAttVal.c | 2 +- afb/afb.h | 2 +- afb/afbbitblt.c | 2 +- afb/afbblt.c | 2 +- afb/afbbres.c | 2 +- afb/afbbresd.c | 2 +- afb/afbbstore.c | 2 +- afb/afbclip.c | 2 +- afb/afbcmap.c | 2 +- afb/afbfillarc.c | 2 +- afb/afbfillrct.c | 2 +- afb/afbfillsp.c | 2 +- afb/afbfont.c | 2 +- afb/afbgc.c | 2 +- afb/afbgetsp.c | 2 +- afb/afbhrzvert.c | 2 +- afb/afbimage.c | 2 +- afb/afbimggblt.c | 2 +- afb/afbline.c | 2 +- afb/afbmisc.c | 2 +- afb/afbpixmap.c | 2 +- afb/afbply1rct.c | 2 +- afb/afbplygblt.c | 2 +- afb/afbpntarea.c | 2 +- afb/afbpntwin.c | 2 +- afb/afbpolypnt.c | 2 +- afb/afbpushpxl.c | 2 +- afb/afbscrinit.c | 2 +- afb/afbsetsp.c | 2 +- afb/afbtegblt.c | 2 +- afb/afbtile.c | 2 +- afb/afbwindow.c | 2 +- afb/afbzerarc.c | 2 +- cfb/cfb.h | 2 +- cfb/cfb8bit.c | 2 +- cfb/cfb8bit.h | 2 +- cfb/cfb8line.c | 2 +- cfb/cfballpriv.c | 2 +- cfb/cfbbitblt.c | 2 +- cfb/cfbblt.c | 2 +- cfb/cfbbres.c | 2 +- cfb/cfbbresd.c | 2 +- cfb/cfbbstore.c | 2 +- cfb/cfbcmap.c | 2 +- cfb/cfbcppl.c | 2 +- cfb/cfbfillarc.c | 2 +- cfb/cfbfillrct.c | 2 +- cfb/cfbfillsp.c | 2 +- cfb/cfbgc.c | 2 +- cfb/cfbgetsp.c | 2 +- cfb/cfbglblt8.c | 2 +- cfb/cfbhrzvert.c | 2 +- cfb/cfbigblt8.c | 2 +- cfb/cfbimage.c | 2 +- cfb/cfbline.c | 2 +- cfb/cfbmap.h | 2 +- cfb/cfbmskbits.c | 2 +- cfb/cfbmskbits.h | 2 +- cfb/cfbpixmap.c | 2 +- cfb/cfbply1rct.c | 2 +- cfb/cfbpntwin.c | 3 +- cfb/cfbpolypnt.c | 2 +- cfb/cfbpush8.c | 2 +- cfb/cfbrctstp8.c | 2 +- cfb/cfbrrop.c | 2 +- cfb/cfbrrop.h | 2 +- cfb/cfbscrinit.c | 2 +- cfb/cfbsetsp.c | 2 +- cfb/cfbsolid.c | 2 +- cfb/cfbtab.h | 2 +- cfb/cfbteblt8.c | 2 +- cfb/cfbtegblt.c | 2 +- cfb/cfbtile32.c | 2 +- cfb/cfbtileodd.c | 2 +- cfb/cfbwindow.c | 2 +- cfb/cfbzerarc.c | 2 +- cfb/stip68kgnu.h | 2 +- cfb/stipsparc.s | 2 +- cfb/stipsprc32.s | 2 +- cfb24/cfbrrop24.h | 2 +- dbe/dbe.c | 3 +- dbe/dbestruct.h | 2 +- dbe/midbe.c | 2 +- dbe/midbe.h | 2 +- dix/atom.c | 2 +- dix/colormap.c | 3 +- dix/cursor.c | 2 +- dix/devices.c | 2 +- dix/dispatch.c | 50 +- dix/dispatch.h | 2 +- dix/dixfonts.c | 31 +- dix/dixutils.c | 2 +- dix/events.c | 75 +- dix/extension.c | 2 +- dix/gc.c | 2 +- dix/globals.c | 5 +- dix/grabs.c | 2 +- dix/main.c | 50 +- dix/pixmap.c | 2 +- dix/privates.c | 2 +- dix/property.c | 2 +- dix/resource.c | 33 +- dix/swaprep.c | 2 +- dix/swapreq.c | 2 +- dix/tables.c | 2 +- dix/window.c | 50 +- dix/xpstubs.c | 20 +- doc/Xserver.man.pre | 95 +- doc/smartsched | 2 +- fb/fb.h | 4 +- fb/fb24_32.c | 2 +- fb/fb24_32.h | 2 +- fb/fballpriv.c | 2 +- fb/fbarc.c | 2 +- fb/fbbits.c | 2 +- fb/fbbits.h | 2 +- fb/fbblt.c | 2 +- fb/fbbltone.c | 2 +- fb/fbbstore.c | 2 +- fb/fbcmap.c | 2 +- fb/fbcompose.c | 13 +- fb/fbcopy.c | 52 +- fb/fbfill.c | 2 +- fb/fbfillrect.c | 2 +- fb/fbfillsp.c | 2 +- fb/fbgc.c | 21 +- fb/fbgetsp.c | 2 +- fb/fbglyph.c | 9 +- fb/fbimage.c | 2 +- fb/fbline.c | 2 +- fb/fboverlay.c | 2 +- fb/fboverlay.h | 2 +- fb/fbpict.c | 2 +- fb/fbpict.h | 2 +- fb/fbpixmap.c | 2 +- fb/fbpoint.c | 2 +- fb/fbpush.c | 2 +- fb/fbrop.h | 2 +- fb/fbscreen.c | 2 +- fb/fbseg.c | 2 +- fb/fbsetsp.c | 2 +- fb/fbsolid.c | 2 +- fb/fbstipple.c | 2 +- fb/fbtile.c | 2 +- fb/fbtrap.c | 2 +- fb/fbutil.c | 2 +- fb/fbwindow.c | 3 +- hw/darwin/XDarwin.man | 2 +- hw/darwin/bundle/Dutch.lproj/Credits.rtf | 102 +- .../Dutch.lproj/MainMenu.nib/classes.nib | 8 + .../bundle/Dutch.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/English.lproj/Credits.rtf | 94 +- .../English.lproj/InfoPlist.strings.cpp | 2 +- .../bundle/English.lproj/Localizable.strings | 2 +- .../bundle/English.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/French.lproj/Credits.rtf | 99 +- .../French.lproj/MainMenu.nib/classes.nib | 8 + .../bundle/French.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/German.lproj/Credits.rtf | 102 +- .../German.lproj/MainMenu.nib/classes.nib | 8 + .../bundle/German.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/Japanese.lproj/Credits.rtf | 128 +- .../Japanese.lproj/MainMenu.nib/classes.nib | 8 + .../Japanese.lproj/XDarwinHelp.html.cpp | 298 +- hw/darwin/bundle/Portuguese.lproj/Credits.rtf | 102 +- .../Portuguese.lproj/MainMenu.nib/classes.nib | 8 + .../Portuguese.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/Spanish.lproj/Credits.rtf | 102 +- .../Spanish.lproj/MainMenu.nib/classes.nib | 8 + .../bundle/Spanish.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/Swedish.lproj/Credits.rtf | 102 +- .../Swedish.lproj/MainMenu.nib/classes.nib | 8 + .../Swedish.lproj/MainMenu.nib/objects.nib | Bin 20444 -> 20851 bytes .../bundle/Swedish.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/XDarwin.icns | Bin 35134 -> 69461 bytes hw/darwin/bundle/ko.lproj/Credits.rtf | 102 +- .../bundle/ko.lproj/MainMenu.nib/classes.nib | 8 + .../bundle/ko.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/startXClients.cpp | 2 +- hw/darwin/darwin.c | 5 +- hw/darwin/darwin.h | 2 +- hw/darwin/darwinClut8.h | 2 +- hw/darwin/darwinEvents.c | 2 +- hw/darwin/darwinKeyboard.c | 2 +- hw/darwin/darwinKeyboard.h | 2 +- hw/darwin/iokit/xfIOKit.c | 4 +- hw/darwin/iokit/xfIOKit.h | 2 +- hw/darwin/iokit/xfIOKitCursor.c | 2 +- hw/darwin/iokit/xfIOKitStartup.c | 2 +- hw/darwin/quartz/Preferences.h | 2 +- hw/darwin/quartz/Preferences.m | 2 +- hw/darwin/quartz/XApplication.h | 2 +- hw/darwin/quartz/XApplication.m | 2 +- .../quartz/XDarwin.pbproj/project.pbxproj | 4 +- hw/darwin/quartz/XDarwinStartup.c | 2 +- hw/darwin/quartz/XDarwinStartup.man | 2 +- hw/darwin/quartz/XServer.h | 6 +- hw/darwin/quartz/XServer.m | 49 +- hw/darwin/quartz/applewm.c | 2 +- hw/darwin/quartz/applewmExt.h | 2 +- hw/darwin/quartz/cr/XView.h | 2 +- hw/darwin/quartz/cr/XView.m | 2 +- hw/darwin/quartz/cr/cr.h | 2 +- hw/darwin/quartz/cr/crAppleWM.m | 2 +- hw/darwin/quartz/cr/crFrame.m | 7 +- hw/darwin/quartz/cr/crScreen.m | 2 + hw/darwin/quartz/fullscreen/fullscreen.c | 7 +- hw/darwin/quartz/fullscreen/quartzCursor.c | 2 +- hw/darwin/quartz/fullscreen/quartzCursor.h | 2 +- hw/darwin/quartz/keysym2ucs.c | 2 +- hw/darwin/quartz/keysym2ucs.h | 2 +- hw/darwin/quartz/quartz.c | 5 +- hw/darwin/quartz/quartz.h | 3 + hw/darwin/quartz/quartzAudio.c | 2 +- hw/darwin/quartz/quartzAudio.h | 2 +- hw/darwin/quartz/quartzCocoa.m | 3 +- hw/darwin/quartz/quartzCommon.h | 3 +- hw/darwin/quartz/quartzCursor.c | 2 +- hw/darwin/quartz/quartzCursor.h | 2 +- hw/darwin/quartz/quartzKeyboard.c | 4 +- hw/darwin/quartz/quartzPasteboard.c | 2 +- hw/darwin/quartz/quartzPasteboard.h | 2 +- hw/darwin/quartz/quartzStartup.c | 2 +- hw/darwin/quartz/xpr/Xplugin.h | 2 +- hw/darwin/quartz/xpr/appledri.c | 2 +- hw/darwin/quartz/xpr/dri.c | 2 +- hw/darwin/quartz/xpr/dri.h | 2 +- hw/darwin/quartz/xpr/dristruct.h | 2 +- hw/darwin/quartz/xpr/x-hash.c | 2 +- hw/darwin/quartz/xpr/x-hash.h | 2 +- hw/darwin/quartz/xpr/x-hook.c | 2 +- hw/darwin/quartz/xpr/x-hook.h | 2 +- hw/darwin/quartz/xpr/x-list.c | 2 +- hw/darwin/quartz/xpr/x-list.h | 2 +- hw/darwin/quartz/xpr/xpr.h | 2 + hw/darwin/quartz/xpr/xprAppleWM.c | 2 +- hw/darwin/quartz/xpr/xprCursor.c | 2 +- hw/darwin/quartz/xpr/xprFrame.c | 45 +- hw/darwin/quartz/xpr/xprScreen.c | 2 + hw/darwin/utils/README.txt | 2 +- hw/darwin/utils/dumpkeymap.c | 2 +- hw/darwin/utils/dumpkeymap.man | 2 +- hw/vfb/InitInput.c | 2 +- hw/vfb/InitOutput.c | 2 +- hw/vfb/Xvfb.man.pre | 3 +- hw/xfree86/common/compiler.h | 39 +- hw/xfree86/common/extramodes | 2 +- hw/xfree86/common/modeline2c.pl | 2 +- hw/xfree86/common/vesamodes | 2 +- hw/xfree86/common/xf86.h | 3 +- hw/xfree86/common/xf86Bus.c | 6 +- hw/xfree86/common/xf86Config.c | 3 +- hw/xfree86/common/xf86Configure.c | 7 +- hw/xfree86/common/xf86DGA.c | 3 +- hw/xfree86/common/xf86Date.h | 5 +- hw/xfree86/common/xf86DefModes.c | 2 +- hw/xfree86/common/xf86Events.c | 5 +- hw/xfree86/common/xf86Globals.c | 4 +- hw/xfree86/common/xf86Helper.c | 61 +- hw/xfree86/common/xf86Init.c | 63 +- hw/xfree86/common/xf86KbdMach.c | 2 +- hw/xfree86/common/xf86Mode.c | 1 + hw/xfree86/common/xf86Priv.h | 4 +- hw/xfree86/common/xf86Privstr.h | 12 +- hw/xfree86/common/xf86RandR.c | 3 +- hw/xfree86/common/xf86Version.h | 6 +- hw/xfree86/common/xf86cmap.c | 4 +- hw/xfree86/common/xf86sbusBus.c | 2 +- hw/xfree86/common/xf86sbusBus.h | 2 +- hw/xfree86/common/xf86xv.c | 10 +- hw/xfree86/common/xisb.c | 2 +- hw/xfree86/common/xisb.h | 2 +- hw/xfree86/ddc/DDC.HOWTO | 2 +- hw/xfree86/ddc/ddcProperty.c | 2 +- hw/xfree86/ddc/edid.c | 2 +- hw/xfree86/ddc/edid.h | 2 +- hw/xfree86/ddc/interpret_edid.c | 2 +- hw/xfree86/ddc/interpret_vdif.c | 2 +- hw/xfree86/ddc/print_edid.c | 2 +- hw/xfree86/ddc/print_vdif.c | 2 +- hw/xfree86/ddc/vdif.h | 2 +- hw/xfree86/ddc/xf86DDC.c | 2 +- hw/xfree86/ddc/xf86DDC.h | 2 +- hw/xfree86/dixmods/GLcoremodule.c | 2 +- hw/xfree86/dixmods/dbemodule.c | 2 +- hw/xfree86/dixmods/extmod/dgaproc.h | 2 +- hw/xfree86/dixmods/extmod/modinit.c | 2 +- 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 | 4 +- hw/xfree86/dixmods/extmod/xvmod.c | 2 +- hw/xfree86/dixmods/extmod/xvmodproc.h | 2 +- hw/xfree86/dixmods/glxmodule.c | 2 +- hw/xfree86/dixmods/laymodule.c | 2 +- hw/xfree86/dixmods/recordmod.c | 2 +- hw/xfree86/dixmods/shmodule.c | 2 +- hw/xfree86/dixmods/xf86XTrapModule.c | 2 +- hw/xfree86/doc/README.DRI | 2 +- hw/xfree86/doc/README.fonts | 41 +- hw/xfree86/doc/README.rapidaccess | 2 +- hw/xfree86/doc/changelogs/CHANGELOG | 459 ++- hw/xfree86/doc/changelogs/CHANGELOG.ND | 2 +- hw/xfree86/doc/devel/Domain.note | 2 +- hw/xfree86/doc/devel/README.DRIcomp | 2 +- hw/xfree86/doc/devel/Registry | 2 +- hw/xfree86/doc/sgml/DESIGN.sgml | 4 +- hw/xfree86/dri/dri.c | 4 +- hw/xfree86/dri/dri.h | 2 +- hw/xfree86/dri/drimodule.c | 3 +- hw/xfree86/dri/dristruct.h | 2 +- hw/xfree86/dri/sarea.h | 4 +- hw/xfree86/dri/xf86dri.c | 2 +- hw/xfree86/dummylib/README | 2 +- hw/xfree86/dummylib/dummylib.h | 2 +- hw/xfree86/dummylib/fatalerror.c | 2 +- hw/xfree86/dummylib/getvalidbios.c | 2 +- hw/xfree86/dummylib/logvwrite.c | 2 +- hw/xfree86/dummylib/pcitestmulti.c | 2 +- hw/xfree86/dummylib/verrorf.c | 2 +- hw/xfree86/dummylib/xalloc.c | 2 +- hw/xfree86/dummylib/xf86addrestolist.c | 2 +- hw/xfree86/dummylib/xf86allocscripi.c | 2 +- hw/xfree86/dummylib/xf86drvmsg.c | 2 +- hw/xfree86/dummylib/xf86drvmsgverb.c | 2 +- hw/xfree86/dummylib/xf86errorf.c | 2 +- hw/xfree86/dummylib/xf86errorfverb.c | 2 +- hw/xfree86/dummylib/xf86getpagesize.c | 2 +- hw/xfree86/dummylib/xf86getverb.c | 2 +- hw/xfree86/dummylib/xf86info.c | 2 +- hw/xfree86/dummylib/xf86msg.c | 2 +- hw/xfree86/dummylib/xf86msgverb.c | 2 +- hw/xfree86/dummylib/xf86opt.c | 2 +- hw/xfree86/dummylib/xf86screens.c | 2 +- hw/xfree86/dummylib/xf86servisinit.c | 2 +- hw/xfree86/dummylib/xf86verbose.c | 2 +- hw/xfree86/fbdevhw/fbdevhw.c | 2 +- hw/xfree86/fbdevhw/fbdevhw.h | 2 +- hw/xfree86/fbdevhw/fbdevhw.man.pre | 2 +- hw/xfree86/fbdevhw/fbdevhwstub.c | 2 +- hw/xfree86/fbdevhw/fbpriv.h | 2 +- hw/xfree86/getconfig/cfg.man.pre | 2 +- hw/xfree86/getconfig/cfg.sample | 2 +- hw/xfree86/getconfig/getconfig.man.pre | 2 +- hw/xfree86/i2c/xf86i2c.c | 2 +- hw/xfree86/i2c/xf86i2c.h | 2 +- hw/xfree86/i2c/xf86i2cmodule.c | 2 +- hw/xfree86/int10/INT10.HOWTO | 2 +- hw/xfree86/int10/generic.c | 2 +- hw/xfree86/int10/helper_exec.c | 4 +- hw/xfree86/int10/helper_mem.c | 2 +- hw/xfree86/int10/pci.c | 2 +- hw/xfree86/int10/stub.c | 2 +- hw/xfree86/int10/xf86int10.c | 2 +- hw/xfree86/int10/xf86int10.h | 2 +- hw/xfree86/int10/xf86int10module.c | 2 +- hw/xfree86/int10/xf86x86emu.c | 2 +- hw/xfree86/int10/xf86x86emu.h | 2 +- hw/xfree86/loader/SparcMulDiv.S | 2 +- hw/xfree86/loader/aout.h | 2 +- hw/xfree86/loader/aoutloader.c | 2 +- hw/xfree86/loader/aoutloader.h | 2 +- hw/xfree86/loader/ar.h | 2 +- hw/xfree86/loader/coff.h | 2 +- hw/xfree86/loader/coffloader.c | 6 +- hw/xfree86/loader/coffloader.h | 2 +- hw/xfree86/loader/dixsym.c | 10 +- hw/xfree86/loader/dlloader.h | 2 +- hw/xfree86/loader/elf.h | 2 +- hw/xfree86/loader/elfloader.c | 40 +- hw/xfree86/loader/elfloader.h | 2 +- hw/xfree86/loader/extsym.c | 1 + hw/xfree86/loader/fontsym.c | 6 +- hw/xfree86/loader/hash.c | 5 +- hw/xfree86/loader/hash.h | 2 +- hw/xfree86/loader/loader.c | 8 +- hw/xfree86/loader/misym.c | 1 + hw/xfree86/loader/sym.h | 2 +- hw/xfree86/os-support/README.OS-lib | 2 +- hw/xfree86/os-support/bsd/alpha_video.c | 34 +- hw/xfree86/os-support/bsd/arm_video.c | 2 +- hw/xfree86/os-support/bsd/bsdResource.c | 2 +- hw/xfree86/os-support/bsd/bsd_KbdMap.c | 2 +- hw/xfree86/os-support/bsd/bsd_VTsw.c | 2 +- hw/xfree86/os-support/bsd/bsd_apm.c | 2 +- hw/xfree86/os-support/bsd/bsd_axp.c | 2 +- hw/xfree86/os-support/bsd/bsd_ev56.c | 2 +- hw/xfree86/os-support/bsd/bsd_init.c | 2 +- hw/xfree86/os-support/bsd/bsd_io.c | 2 +- hw/xfree86/os-support/bsd/bsd_jstk.c | 2 +- hw/xfree86/os-support/bsd/bsd_kbd.c | 2 +- hw/xfree86/os-support/bsd/bsd_kbd.h | 2 +- hw/xfree86/os-support/bsd/bsd_kmod.c | 2 +- hw/xfree86/os-support/bsd/bsd_mouse.c | 67 +- hw/xfree86/os-support/bsd/i386_video.c | 2 +- hw/xfree86/os-support/bsd/libusb/data.c | 2 +- hw/xfree86/os-support/bsd/libusb/descr.c | 2 +- hw/xfree86/os-support/bsd/libusb/parse.c | 2 +- hw/xfree86/os-support/bsd/libusb/usage.c | 2 +- hw/xfree86/os-support/bsd/libusb/usb.3 | 2 +- hw/xfree86/os-support/bsd/libusb/usb.h | 2 +- .../os-support/bsd/libusb/usb_hid_usages | 2 +- hw/xfree86/os-support/bsd/libusb/usbvar.h | 2 +- hw/xfree86/os-support/bsd/memrange.h | 2 +- hw/xfree86/os-support/bsd/ppc_video.c | 2 +- hw/xfree86/os-support/bsd/sparc64_video.c | 2 +- hw/xfree86/os-support/bus/Pci.c | 8 +- hw/xfree86/os-support/bus/Pci.h | 6 +- hw/xfree86/os-support/bus/Sbus.c | 2 +- hw/xfree86/os-support/bus/axpPci.c | 2 +- hw/xfree86/os-support/bus/freebsdPci.c | 2 +- hw/xfree86/os-support/bus/linuxPci.c | 2 +- hw/xfree86/os-support/bus/ppcPci.c | 2 +- hw/xfree86/os-support/bus/xf86Sbus.h | 2 +- hw/xfree86/os-support/bus/zx1PCI.c | 131 +- hw/xfree86/os-support/drm/drmmodule.c | 2 +- hw/xfree86/os-support/linux/int10/linux.c | 10 +- .../os-support/linux/int10/vm86/linux_vm86.c | 2 +- hw/xfree86/os-support/linux/lnx.h | 2 +- hw/xfree86/os-support/linux/lnxResource.c | 13 +- hw/xfree86/os-support/linux/lnx_KbdMap.c | 2 +- hw/xfree86/os-support/linux/lnx_agp.c | 2 +- hw/xfree86/os-support/linux/lnx_apm.c | 2 +- hw/xfree86/os-support/linux/lnx_axp.c | 2 +- hw/xfree86/os-support/linux/lnx_ev56.c | 2 +- hw/xfree86/os-support/linux/lnx_init.c | 78 +- hw/xfree86/os-support/linux/lnx_io.c | 14 +- hw/xfree86/os-support/linux/lnx_jstk.c | 2 +- hw/xfree86/os-support/linux/lnx_kbd.c | 14 +- hw/xfree86/os-support/linux/lnx_kbd.h | 2 +- hw/xfree86/os-support/linux/lnx_kmod.c | 2 +- hw/xfree86/os-support/linux/lnx_pci.c | 2 +- hw/xfree86/os-support/linux/lnx_video.c | 2 +- hw/xfree86/os-support/lynxos/lynx_init.c | 2 +- hw/xfree86/os-support/lynxos/lynx_io.c | 2 +- hw/xfree86/os-support/lynxos/lynx_mmap.c | 2 +- hw/xfree86/os-support/lynxos/lynx_noinline.c | 2 +- hw/xfree86/os-support/lynxos/lynx_ppc.c | 2 +- hw/xfree86/os-support/lynxos/lynx_video.c | 2 +- hw/xfree86/os-support/misc/BUSmemcpy.S | 2 +- hw/xfree86/os-support/misc/BUSmemcpy.c | 2 +- hw/xfree86/os-support/misc/Delay.c | 2 +- hw/xfree86/os-support/misc/IODelay.S | 2 +- hw/xfree86/os-support/misc/IODelay.c | 2 +- hw/xfree86/os-support/misc/PortIO.S | 2 +- hw/xfree86/os-support/misc/SlowBcopy.S | 2 +- hw/xfree86/os-support/misc/SlowBcopy.c | 10 +- hw/xfree86/os-support/misc/xf86_IlHack.c | 2 +- hw/xfree86/os-support/misc/xf86_Util.c | 2 +- hw/xfree86/os-support/sco/VTsw_sco.c | 2 +- hw/xfree86/os-support/sco/sco_init.c | 2 +- hw/xfree86/os-support/sco/sco_io.c | 2 +- hw/xfree86/os-support/sco/sco_iop.c | 2 +- hw/xfree86/os-support/sco/sco_mouse.c | 2 +- hw/xfree86/os-support/sco/sco_video.c | 2 +- hw/xfree86/os-support/shared/VTsw_noop.c | 2 +- hw/xfree86/os-support/shared/VTsw_usl.c | 2 +- hw/xfree86/os-support/shared/bios_devmem.c | 2 +- hw/xfree86/os-support/shared/bios_mmap.c | 2 +- hw/xfree86/os-support/shared/inout.S | 2 +- hw/xfree86/os-support/shared/ioperm_noop.c | 2 +- hw/xfree86/os-support/shared/libc_wrapper.c | 2 +- hw/xfree86/os-support/shared/std_kbdEv.c | 2 +- hw/xfree86/os-support/shared/sysv_kbd.c | 2 +- hw/xfree86/os-support/shared/xf86Axp.h | 2 +- hw/xfree86/os-support/solaris/apSolaris.shar | 2 +- hw/xfree86/os-support/solaris/sun_bios.c | 2 +- hw/xfree86/os-support/solaris/sun_init.c | 2 +- hw/xfree86/os-support/solaris/sun_inout.s | 2 +- hw/xfree86/os-support/solaris/sun_io.c | 2 +- hw/xfree86/os-support/solaris/sun_kbd.c | 2 +- hw/xfree86/os-support/solaris/sun_kbdEv.c | 2 +- hw/xfree86/os-support/solaris/sun_vid.c | 2 +- hw/xfree86/os-support/sysv/sysv_init.c | 2 +- hw/xfree86/os-support/sysv/sysv_io.c | 2 +- hw/xfree86/os-support/sysv/sysv_video.c | 2 +- hw/xfree86/os-support/sysv/xqueue.c | 2 +- hw/xfree86/os-support/sysv/xqueue.h | 2 +- hw/xfree86/os-support/xf86OSKbd.h | 2 +- hw/xfree86/os-support/xf86_OSlib.h | 2 +- hw/xfree86/os-support/xf86_OSproc.h | 2 +- hw/xfree86/os-support/xf86_libc.h | 4 +- hw/xfree86/parser/DRI.c | 2 +- hw/xfree86/parser/cpconfig.c | 2 +- hw/xfree86/rac/xf86RAC.c | 2 +- hw/xfree86/rac/xf86RAC.h | 2 +- hw/xfree86/rac/xf86RACmodule.c | 2 +- hw/xfree86/ramdac/BT.c | 2 +- hw/xfree86/ramdac/BT.h | 2 +- hw/xfree86/ramdac/BTPriv.h | 2 +- hw/xfree86/ramdac/CURSOR.NOTES | 2 +- hw/xfree86/ramdac/IBM.c | 2 +- hw/xfree86/ramdac/IBM.h | 2 +- hw/xfree86/ramdac/IBMPriv.h | 2 +- hw/xfree86/ramdac/TI.c | 2 +- hw/xfree86/ramdac/TI.h | 2 +- hw/xfree86/ramdac/TIPriv.h | 2 +- hw/xfree86/ramdac/xf86Cursor.c | 2 +- hw/xfree86/ramdac/xf86Cursor.h | 2 +- hw/xfree86/ramdac/xf86CursorPriv.h | 2 +- hw/xfree86/ramdac/xf86HWCurs.c | 2 +- hw/xfree86/ramdac/xf86RamDac.c | 2 +- hw/xfree86/ramdac/xf86RamDac.h | 2 +- hw/xfree86/ramdac/xf86RamDacCmap.c | 2 +- hw/xfree86/ramdac/xf86RamDacMod.c | 2 +- hw/xfree86/ramdac/xf86RamDacPriv.h | 2 +- hw/xfree86/scanpci/extrapci.ids | 26 +- hw/xfree86/scanpci/pci.ids | 463 ++- hw/xfree86/scanpci/xf86PciStdIds.h | 2840 ++++++++++++++++- hw/xfree86/scanpci/xf86ScanPci.c | 2 +- hw/xfree86/shadowfb/sfbmodule.c | 2 +- hw/xfree86/shadowfb/shadow.c | 2 +- hw/xfree86/shadowfb/shadowfb.h | 2 +- hw/xfree86/utils/gtf/gtf.c | 2 +- hw/xfree86/utils/gtf/gtf.man.pre | 2 +- hw/xfree86/utils/ioport/ioport.c | 2 +- hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c | 2 +- .../utils/kbd_mode/bsd-kbd_mode.man.pre | 2 +- hw/xfree86/utils/kbd_mode/sun-kbd_mode.c | 2 +- .../utils/kbd_mode/sun-kbd_mode.man.pre | 2 +- hw/xfree86/utils/pcitweak/pcitweak.man.pre | 2 +- hw/xfree86/utils/scanpci/scanpci.c | 2 +- hw/xfree86/utils/scanpci/scanpci.man.pre | 2 +- hw/xfree86/utils/xorgcfg/TODO | 2 +- hw/xfree86/utils/xorgcfg/accessx.c | 2 +- hw/xfree86/utils/xorgcfg/card-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/card-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/card.xbm | 2 +- hw/xfree86/utils/xorgcfg/card.xpm | 2 +- hw/xfree86/utils/xorgcfg/cards.c | 2 +- hw/xfree86/utils/xorgcfg/cards.h | 2 +- hw/xfree86/utils/xorgcfg/computer.xpm | 2 +- hw/xfree86/utils/xorgcfg/config.c | 2 +- hw/xfree86/utils/xorgcfg/config.h | 9 +- hw/xfree86/utils/xorgcfg/expert.c | 2 +- hw/xfree86/utils/xorgcfg/help.c | 2 +- hw/xfree86/utils/xorgcfg/help.h | 2 +- hw/xfree86/utils/xorgcfg/interface.c | 2 +- hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/keyboard-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/keyboard.xbm | 2 +- hw/xfree86/utils/xorgcfg/keyboard.xpm | 2 +- hw/xfree86/utils/xorgcfg/loader.c | 8 + hw/xfree86/utils/xorgcfg/loader.h | 2 +- hw/xfree86/utils/xorgcfg/loadmod.c | 4 +- hw/xfree86/utils/xorgcfg/monitor-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/monitor-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/monitor.xbm | 2 +- hw/xfree86/utils/xorgcfg/monitor.xpm | 2 +- hw/xfree86/utils/xorgcfg/mouse-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/mouse-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/mouse.xbm | 2 +- hw/xfree86/utils/xorgcfg/mouse.xpm | 2 +- hw/xfree86/utils/xorgcfg/options.c | 2 +- hw/xfree86/utils/xorgcfg/options.h | 2 +- hw/xfree86/utils/xorgcfg/screen-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/screen-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/screen.c | 2 +- hw/xfree86/utils/xorgcfg/screen.h | 2 +- hw/xfree86/utils/xorgcfg/startx.c | 2 +- hw/xfree86/utils/xorgcfg/stubs.c | 2 +- hw/xfree86/utils/xorgcfg/stubs.h | 2 +- hw/xfree86/utils/xorgcfg/text-mode.c | 2 +- hw/xfree86/utils/xorgcfg/vidmode.c | 2 +- hw/xfree86/utils/xorgcfg/vidmode.h | 2 +- hw/xfree86/utils/xorgcfg/xf86config.c | 2 +- hw/xfree86/utils/xorgcfg/xf86config.h | 2 +- hw/xfree86/utils/xorgconfig/Cards | 2 +- hw/xfree86/utils/xorgconfig/Cards98 | 2 +- hw/xfree86/utils/xorgconfig/cards.c | 2 +- hw/xfree86/utils/xorgconfig/cards.h | 2 +- hw/xfree86/vbe/vbe.c | 2 +- hw/xfree86/vbe/vbe.h | 5 +- hw/xfree86/vbe/vbeModes.c | 2 +- hw/xfree86/vbe/vbeModes.h | 2 +- hw/xfree86/vbe/vbe_module.c | 2 +- hw/xfree86/vgahw/vgaCmap.c | 2 +- hw/xfree86/vgahw/vgaHW.c | 41 +- hw/xfree86/x86emu/debug.c | 2 +- hw/xfree86/x86emu/decode.c | 5 + hw/xfree86/x86emu/fpu.c | 2 +- hw/xfree86/x86emu/ops.c | 2 +- hw/xfree86/x86emu/ops2.c | 58 +- 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 +- hw/xfree86/xaa/XAA.HOWTO | 2 +- hw/xfree86/xaa/xaa.h | 2 +- hw/xfree86/xaa/xaaBitBlt.c | 2 +- hw/xfree86/xaa/xaaBitOrder.c | 2 +- hw/xfree86/xaa/xaaBitmap.c | 2 +- hw/xfree86/xaa/xaaCpyArea.c | 2 +- hw/xfree86/xaa/xaaCpyPlane.c | 2 +- hw/xfree86/xaa/xaaCpyWin.c | 2 +- hw/xfree86/xaa/xaaDashLine.c | 2 +- hw/xfree86/xaa/xaaFallback.c | 2 +- hw/xfree86/xaa/xaaFillArc.c | 2 +- hw/xfree86/xaa/xaaFillPoly.c | 2 +- hw/xfree86/xaa/xaaFillRect.c | 2 +- hw/xfree86/xaa/xaaGC.c | 2 +- hw/xfree86/xaa/xaaGCmisc.c | 2 +- hw/xfree86/xaa/xaaImage.c | 2 +- hw/xfree86/xaa/xaaInit.c | 2 +- hw/xfree86/xaa/xaaInitAccel.c | 2 +- hw/xfree86/xaa/xaaLine.c | 2 +- hw/xfree86/xaa/xaaLineMisc.c | 2 +- hw/xfree86/xaa/xaaNonTEGlyph.c | 2 +- hw/xfree86/xaa/xaaNonTEText.c | 2 +- hw/xfree86/xaa/xaaOffscreen.c | 2 +- hw/xfree86/xaa/xaaOverlay.c | 3 +- hw/xfree86/xaa/xaaOverlayDF.c | 2 +- hw/xfree86/xaa/xaaPCache.c | 2 +- hw/xfree86/xaa/xaaPaintWin.c | 3 +- hw/xfree86/xaa/xaaPict.c | 3 + hw/xfree86/xaa/xaaROP.c | 2 +- hw/xfree86/xaa/xaaRect.c | 2 +- hw/xfree86/xaa/xaaSpans.c | 2 +- hw/xfree86/xaa/xaaStateChange.c | 2 +- hw/xfree86/xaa/xaaStipple.c | 2 +- hw/xfree86/xaa/xaaTEGlyph.c | 2 +- hw/xfree86/xaa/xaaTEGlyphBlt.S | 2 +- hw/xfree86/xaa/xaaTEText.c | 2 +- hw/xfree86/xaa/xaaTables.c | 2 +- hw/xfree86/xaa/xaaWideLine.c | 2 +- hw/xfree86/xaa/xaacexp.h | 2 +- hw/xfree86/xaa/xaalocal.h | 2 +- hw/xfree86/xaa/xaarop.h | 2 +- hw/xfree86/xaa/xaawrap.h | 2 +- hw/xfree86/xf1bpp/mfbmap.h | 2 +- hw/xfree86/xf1bpp/mfbmap.sh | 2 +- hw/xfree86/xf1bpp/mfbunmap.h | 2 +- hw/xfree86/xf1bpp/mfbunmap.sh | 2 +- hw/xfree86/xf4bpp/NOTES | 2 +- hw/xfree86/xf4bpp/OScompiler.h | 2 +- hw/xfree86/xf4bpp/emulOpStip.c | 2 +- hw/xfree86/xf4bpp/emulRepAre.c | 2 +- hw/xfree86/xf4bpp/emulTile.c | 2 +- hw/xfree86/xf4bpp/ibmTrace.h | 2 +- hw/xfree86/xf4bpp/mfbbres.c | 2 +- hw/xfree86/xf4bpp/mfbbresd.c | 2 +- hw/xfree86/xf4bpp/mfbfillarc.c | 2 +- hw/xfree86/xf4bpp/mfbhrzvert.c | 2 +- hw/xfree86/xf4bpp/mfbimggblt.c | 2 +- hw/xfree86/xf4bpp/mfbline.c | 2 +- hw/xfree86/xf4bpp/mfbzerarc.c | 2 +- hw/xfree86/xf4bpp/offscreen.c | 2 +- hw/xfree86/xf4bpp/ppcArea.c | 2 +- hw/xfree86/xf4bpp/ppcBStore.c | 2 +- hw/xfree86/xf4bpp/ppcCReduce.c | 2 +- hw/xfree86/xf4bpp/ppcClip.c | 2 +- hw/xfree86/xf4bpp/ppcCpArea.c | 2 +- hw/xfree86/xf4bpp/ppcDepth.c | 2 +- hw/xfree86/xf4bpp/ppcFillRct.c | 2 +- hw/xfree86/xf4bpp/ppcGC.c | 2 +- hw/xfree86/xf4bpp/ppcGCstr.h | 2 +- hw/xfree86/xf4bpp/ppcGetSp.c | 2 +- hw/xfree86/xf4bpp/ppcIO.c | 2 +- hw/xfree86/xf4bpp/ppcImg.c | 2 +- hw/xfree86/xf4bpp/ppcPixFS.c | 2 +- hw/xfree86/xf4bpp/ppcPixmap.c | 2 +- hw/xfree86/xf4bpp/ppcPntWin.c | 2 +- hw/xfree86/xf4bpp/ppcPolyPnt.c | 2 +- hw/xfree86/xf4bpp/ppcPolyRec.c | 2 +- hw/xfree86/xf4bpp/ppcQuery.c | 2 +- hw/xfree86/xf4bpp/ppcRslvC.c | 2 +- hw/xfree86/xf4bpp/ppcSetSp.c | 2 +- hw/xfree86/xf4bpp/ppcSpMcro.h | 2 +- hw/xfree86/xf4bpp/ppcWinFS.c | 2 +- hw/xfree86/xf4bpp/ppcWindow.c | 2 +- hw/xfree86/xf4bpp/vgaBitBlt.c | 2 +- hw/xfree86/xf4bpp/vgaGC.c | 2 +- hw/xfree86/xf4bpp/vgaImages.c | 2 +- hw/xfree86/xf4bpp/vgaReg.h | 2 +- hw/xfree86/xf4bpp/vgaSolid.c | 2 +- hw/xfree86/xf4bpp/vgaStipple.c | 2 +- hw/xfree86/xf4bpp/vgaVideo.h | 2 +- hw/xfree86/xf4bpp/wm3.c | 2 +- hw/xfree86/xf4bpp/wm3.h | 2 +- hw/xfree86/xf4bpp/xf4bpp.h | 2 +- hw/xfree86/xf8_16bpp/cfb8_16.h | 2 +- hw/xfree86/xf8_16bpp/cfb8_16module.c | 2 +- hw/xfree86/xf8_16bpp/cfbscrinit.c | 2 +- hw/xfree86/xf8_16bpp/cfbwindow.c | 2 +- hw/xfree86/xf8_32bpp/cfb8_32.h | 2 +- hw/xfree86/xf8_32bpp/cfb8_32module.c | 2 +- hw/xfree86/xf8_32bpp/cfbbstore.c | 2 +- hw/xfree86/xf8_32bpp/cfbcpyarea.c | 2 +- hw/xfree86/xf8_32bpp/cfbcpyplane.c | 2 +- hw/xfree86/xf8_32bpp/cfbgc.c | 2 +- hw/xfree86/xf8_32bpp/cfbgcmisc.c | 2 +- hw/xfree86/xf8_32bpp/cfbgcunder.c | 2 +- hw/xfree86/xf8_32bpp/cfbimage.c | 2 +- hw/xfree86/xf8_32bpp/cfbpntwin.c | 3 +- hw/xfree86/xf8_32bpp/cfbscrinit.c | 2 +- hw/xfree86/xf8_32bpp/cfbwindow.c | 2 +- hw/xfree86/xf8_32bpp/xf86overlay.c | 2 +- hw/xfree86/xf8_32wid/cfb8_32wid.h | 2 +- hw/xfree86/xf8_32wid/cfb8_32widmodule.c | 2 +- hw/xfree86/xf8_32wid/cfbscrinit.c | 2 +- hw/xfree86/xf8_32wid/cfbwid.c | 2 +- hw/xfree86/xf8_32wid/cfbwindow.c | 2 +- hw/xnest/Args.c | 2 +- hw/xnest/Args.h | 2 +- hw/xnest/Color.c | 2 +- hw/xnest/Color.h | 2 +- hw/xnest/Cursor.c | 2 +- hw/xnest/Display.c | 2 +- hw/xnest/Display.h | 2 +- hw/xnest/Drawable.h | 2 +- hw/xnest/Events.c | 2 +- hw/xnest/Events.h | 2 +- hw/xnest/Font.c | 2 +- hw/xnest/GC.c | 2 +- hw/xnest/GCOps.c | 2 +- hw/xnest/GCOps.h | 2 +- hw/xnest/GetTime.c | 2 +- hw/xnest/Handlers.c | 2 +- hw/xnest/Handlers.h | 2 +- hw/xnest/Init.c | 2 +- hw/xnest/Keyboard.c | 2 +- hw/xnest/Keyboard.h | 2 +- hw/xnest/Pixmap.c | 2 +- hw/xnest/Pointer.c | 2 +- hw/xnest/Pointer.h | 2 +- hw/xnest/Screen.c | 2 +- hw/xnest/Screen.h | 2 +- hw/xnest/TestExt.c | 2 +- hw/xnest/Visual.c | 2 +- hw/xnest/Visual.h | 2 +- hw/xnest/Window.c | 2 +- hw/xnest/XNCursor.h | 2 +- hw/xnest/XNFont.h | 2 +- hw/xnest/XNGC.h | 2 +- hw/xnest/XNPixmap.h | 2 +- hw/xnest/XNWindow.h | 2 +- hw/xnest/Xnest.h | 2 +- hw/xnest/Xnest.man.pre | 2 +- hw/xnest/os2Stub.c | 2 +- hw/xwin/InitInput.c | 2 +- hw/xwin/InitOutput.c | 2 +- hw/xwin/XWin.man | 2 +- hw/xwin/XWin.rc | 2 +- hw/xwin/ddraw.h | 2 +- hw/xwin/win.h | 2 +- hw/xwin/winallpriv.c | 2 +- hw/xwin/winblock.c | 2 +- hw/xwin/winclip.c | 2 +- hw/xwin/winclipboard.h | 2 +- hw/xwin/winclipboardinit.c | 2 +- hw/xwin/winclipboardtextconv.c | 2 +- hw/xwin/winclipboardthread.c | 2 +- hw/xwin/winclipboardunicode.c | 2 +- hw/xwin/winclipboardwndproc.c | 2 +- hw/xwin/winclipboardxevents.c | 2 +- hw/xwin/wincmap.c | 2 +- hw/xwin/winconfig.c | 2 +- hw/xwin/wincreatewnd.c | 2 +- hw/xwin/wincursor.c | 2 +- hw/xwin/windialogs.c | 2 +- hw/xwin/winengine.c | 2 +- hw/xwin/winerror.c | 2 +- hw/xwin/winfillsp.c | 2 +- hw/xwin/winfont.c | 2 +- hw/xwin/wingc.c | 2 +- hw/xwin/wingetsp.c | 2 +- hw/xwin/winkeybd.c | 2 +- hw/xwin/winkeybd.h | 2 +- hw/xwin/winmisc.c | 2 +- hw/xwin/winmouse.c | 2 +- hw/xwin/winms.h | 2 +- hw/xwin/winmsg.c | 2 +- hw/xwin/winmsg.h | 2 +- hw/xwin/winmultiwindowclass.c | 2 +- hw/xwin/winmultiwindowclass.h | 2 +- hw/xwin/winmultiwindowicons.c | 2 +- hw/xwin/winmultiwindowwindow.c | 2 +- hw/xwin/winmultiwindowwm.c | 2 +- hw/xwin/winmultiwindowwndproc.c | 2 +- hw/xwin/winnativegdi.c | 2 +- hw/xwin/winpfbdd.c | 2 +- hw/xwin/winpixmap.c | 2 +- hw/xwin/winpntwin.c | 2 +- hw/xwin/winpolyline.c | 2 +- hw/xwin/winprefs.c | 2 +- hw/xwin/winprefs.h | 2 +- hw/xwin/winprefslex.l | 2 +- hw/xwin/winprefsyacc.y | 2 +- hw/xwin/winpushpxl.c | 2 +- hw/xwin/winregistry.c | 2 +- hw/xwin/winrop.c | 2 +- hw/xwin/winscrinit.c | 2 +- hw/xwin/winsetsp.c | 2 +- hw/xwin/winshaddd.c | 2 +- hw/xwin/winshadddnl.c | 2 +- hw/xwin/winshadgdi.c | 2 +- hw/xwin/wintrayicon.c | 2 +- hw/xwin/winvideo.c | 2 +- hw/xwin/winwakeup.c | 2 +- hw/xwin/winwindow.h | 2 +- hw/xwin/winwndproc.c | 2 +- ilbm/ilbm.h | 2 +- ilbm/ilbmbitblt.c | 2 +- ilbm/ilbmblt.c | 2 +- ilbm/ilbmbres.c | 2 +- ilbm/ilbmbresd.c | 2 +- ilbm/ilbmbstore.c | 2 +- ilbm/ilbmclip.c | 2 +- ilbm/ilbmcmap.c | 2 +- ilbm/ilbmfillarc.c | 2 +- ilbm/ilbmfillrct.c | 2 +- ilbm/ilbmfillsp.c | 2 +- ilbm/ilbmfont.c | 2 +- ilbm/ilbmgc.c | 2 +- ilbm/ilbmgetsp.c | 2 +- ilbm/ilbmhrzvert.c | 2 +- ilbm/ilbmimage.c | 2 +- ilbm/ilbmimggblt.c | 2 +- ilbm/ilbmline.c | 2 +- ilbm/ilbmmisc.c | 2 +- ilbm/ilbmpixmap.c | 2 +- ilbm/ilbmply1rct.c | 2 +- ilbm/ilbmplygblt.c | 2 +- ilbm/ilbmpntarea.c | 2 +- ilbm/ilbmpntwin.c | 2 +- ilbm/ilbmpolypnt.c | 2 +- ilbm/ilbmpushpxl.c | 2 +- ilbm/ilbmscrinit.c | 2 +- ilbm/ilbmsetsp.c | 2 +- ilbm/ilbmtegblt.c | 2 +- ilbm/ilbmtile.c | 2 +- ilbm/ilbmwindow.c | 2 +- ilbm/ilbmzerarc.c | 2 +- include/XIstubs.h | 2 +- include/bstore.h | 2 +- include/bstorestr.h | 2 +- include/closestr.h | 2 +- include/colormap.h | 2 +- include/cursor.h | 3 +- include/cursorstr.h | 2 +- include/dix.h | 2 +- include/dixevents.h | 2 +- include/dixfont.h | 2 +- include/dixgrabs.h | 2 +- include/dixstruct.h | 2 +- include/exevents.h | 2 +- include/extension.h | 2 +- include/extinit.h | 2 +- include/extnsionst.h | 2 +- include/gc.h | 2 +- include/gcstruct.h | 2 +- include/globals.h | 3 +- include/input.h | 2 +- include/inputstr.h | 2 +- include/misc.h | 2 +- include/miscstruct.h | 2 +- include/opaque.h | 2 +- include/os.h | 2 +- include/pixmap.h | 2 +- include/pixmapstr.h | 2 +- include/property.h | 2 +- include/propertyst.h | 2 +- include/regionstr.h | 22 +- include/resource.h | 2 +- include/screenint.h | 2 +- include/scrnintstr.h | 2 +- include/servermd.h | 4 +- include/site.h | 2 +- include/swaprep.h | 2 +- include/swapreq.h | 2 +- include/validate.h | 2 +- include/window.h | 2 +- include/windowstr.h | 2 +- iplan2p4/ipl.h | 2 +- iplan2p4/iplallpriv.c | 2 +- iplan2p4/iplbitblt.c | 2 +- iplan2p4/iplblt.c | 2 +- iplan2p4/iplbres.c | 2 +- iplan2p4/iplbresd.c | 2 +- iplan2p4/iplbstore.c | 2 +- iplan2p4/iplcmap.c | 2 +- iplan2p4/iplfillarc.c | 2 +- iplan2p4/iplfillrct.c | 2 +- iplan2p4/iplfillsp.c | 2 +- iplan2p4/iplgc.c | 2 +- iplan2p4/iplgetsp.c | 2 +- iplan2p4/iplhrzvert.c | 2 +- iplan2p4/iplimage.c | 2 +- iplan2p4/iplline.c | 2 +- iplan2p4/iplmap.h | 2 +- iplan2p4/iplmergerop.h | 2 +- iplan2p4/iplmskbits.c | 2 +- iplan2p4/iplmskbits.h | 2 +- iplan2p4/iplpack.c | 2 +- iplan2p4/iplpack.h | 2 +- iplan2p4/iplpixmap.c | 2 +- iplan2p4/iplply1rct.c | 2 +- iplan2p4/iplpntwin.c | 2 +- iplan2p4/iplpolypnt.c | 2 +- iplan2p4/iplrrop.c | 2 +- iplan2p4/iplrrop.h | 2 +- iplan2p4/iplscrinit.c | 2 +- iplan2p4/iplsetsp.c | 2 +- iplan2p4/iplsolid.c | 2 +- iplan2p4/ipltegblt.c | 2 +- iplan2p4/ipltile32.c | 2 +- iplan2p4/ipltileodd.c | 2 +- iplan2p4/iplwindow.c | 2 +- lbx/lbxcmap.c | 2 +- lbx/lbxdix.c | 2 +- lbx/lbxexts.c | 2 +- lbx/lbxgfx.c | 2 +- lbx/lbxmain.c | 2 +- lbx/lbxopts.c | 2 +- lbx/lbxprop.c | 2 +- lbx/lbxserve.h | 2 +- lbx/lbxsquish.c | 2 +- lbx/lbxsrvopts.h | 2 +- lbx/lbxswap.c | 2 +- lbx/lbxtables.c | 2 +- lbx/lbxtags.c | 2 +- lbx/lbxtags.h | 2 +- lbx/lbxzerorep.c | 2 +- mfb/fastblt.h | 2 +- mfb/maskbits.c | 2 +- mfb/maskbits.h | 2 +- mfb/mergerop.h | 2 +- mfb/mfb.h | 2 +- mfb/mfbbitblt.c | 2 +- mfb/mfbblt.c | 2 +- mfb/mfbbres.c | 2 +- mfb/mfbbresd.c | 2 +- mfb/mfbclip.c | 2 +- mfb/mfbcmap.c | 2 +- mfb/mfbfillarc.c | 2 +- mfb/mfbfillrct.c | 2 +- mfb/mfbfillsp.c | 2 +- mfb/mfbgc.c | 2 +- mfb/mfbgetsp.c | 2 +- mfb/mfbhrzvert.c | 2 +- mfb/mfbimage.c | 2 +- mfb/mfbimggblt.c | 2 +- mfb/mfbline.c | 2 +- mfb/mfbply1rct.c | 2 +- mfb/mfbplygblt.c | 2 +- mfb/mfbpolypnt.c | 2 +- mfb/mfbpushpxl.c | 2 +- mfb/mfbscrclse.c | 2 +- mfb/mfbscrinit.c | 2 +- mfb/mfbsetsp.c | 2 +- mfb/mfbtegblt.c | 2 +- mfb/mfbtile.c | 2 +- mfb/mfbwindow.c | 2 +- mfb/mfbzerarc.c | 2 +- mi/cbrt.c | 2 +- mi/mi.h | 2 +- mi/miarc.c | 6 +- mi/mibank.c | 2 +- mi/mibank.h | 2 +- mi/mibitblt.c | 2 +- mi/mibstore.c | 2 +- mi/mibstore.h | 2 +- mi/mibstorest.h | 2 +- mi/miclipn.c | 2 +- mi/micmap.c | 2 +- mi/micmap.h | 2 +- mi/micoord.h | 2 +- mi/micursor.c | 2 +- mi/midash.c | 2 +- mi/midispcur.c | 2 +- mi/mieq.c | 2 +- mi/miexpose.c | 30 +- mi/mifillarc.c | 2 +- mi/mifillarc.h | 2 +- mi/mifillrct.c | 2 +- mi/mifpoly.h | 2 +- mi/mifpolycon.c | 2 +- mi/migc.c | 2 +- mi/migc.h | 2 +- mi/miglblt.c | 2 +- mi/miinitext.c | 3 +- mi/miline.h | 2 +- mi/mioverlay.c | 2 +- mi/mioverlay.h | 2 +- mi/mipointer.c | 2 +- mi/mipointer.h | 2 +- mi/mipointrst.h | 2 +- mi/mipoly.c | 2 +- mi/mipoly.h | 2 +- mi/mipolycon.c | 2 +- mi/mipolygen.c | 2 +- mi/mipolypnt.c | 2 +- mi/mipolyrect.c | 2 +- mi/mipolyseg.c | 2 +- mi/mipolytext.c | 2 +- mi/mipolyutil.c | 2 +- mi/mipushpxl.c | 2 +- mi/miregion.c | 49 +- mi/miscrinit.c | 2 +- mi/mispans.c | 2 +- mi/mispans.h | 2 +- mi/misprite.c | 2 +- mi/misprite.h | 2 +- mi/mispritest.h | 2 +- mi/mistruct.h | 2 +- mi/mivalidate.h | 2 +- mi/mivaltree.c | 50 +- mi/miwideline.c | 2 +- mi/miwideline.h | 2 +- mi/miwindow.c | 2 +- mi/mizerarc.c | 2 +- mi/mizerarc.h | 2 +- mi/mizerclip.c | 2 +- mi/mizerline.c | 2 +- miext/layer/layer.h | 2 +- miext/layer/layergc.c | 2 +- miext/layer/layerinit.c | 2 +- miext/layer/layerpict.c | 2 +- miext/layer/layerstr.h | 2 +- miext/layer/layerwin.c | 2 +- miext/rootless/accel/rlAccel.h | 2 +- miext/rootless/accel/rlBlt.c | 2 +- miext/rootless/accel/rlCopy.c | 2 +- miext/rootless/accel/rlFill.c | 2 +- miext/rootless/accel/rlFillRect.c | 2 +- miext/rootless/accel/rlFillSpans.c | 2 +- miext/rootless/accel/rlGlyph.c | 2 +- miext/rootless/accel/rlSolid.c | 2 +- miext/rootless/rootless.h | 2 +- miext/rootless/rootlessCommon.c | 2 +- miext/rootless/rootlessCommon.h | 2 +- miext/rootless/rootlessConfig.h | 2 +- miext/rootless/rootlessGC.c | 2 +- miext/rootless/rootlessScreen.c | 2 +- miext/rootless/rootlessValTree.c | 49 +- miext/rootless/rootlessWindow.c | 9 +- miext/rootless/rootlessWindow.h | 2 +- miext/rootless/safeAlpha/safeAlpha.h | 1 - miext/rootless/safeAlpha/safeAlphaPicture.c | 1 + miext/rootless/safeAlpha/safeAlphaWindow.c | 2 + miext/shadow/shadow.c | 2 +- miext/shadow/shadow.h | 2 +- miext/shadow/shalloc.c | 2 +- miext/shadow/shpacked.c | 2 +- miext/shadow/shplanar.c | 2 +- miext/shadow/shplanar8.c | 2 +- miext/shadow/shrot16pack.c | 2 +- miext/shadow/shrot16pack_180.c | 2 +- miext/shadow/shrot16pack_270.c | 2 +- miext/shadow/shrot16pack_90.c | 2 +- miext/shadow/shrot32pack.c | 2 +- miext/shadow/shrot32pack_180.c | 2 +- miext/shadow/shrot32pack_270.c | 2 +- miext/shadow/shrot32pack_90.c | 2 +- miext/shadow/shrot8pack.c | 2 +- miext/shadow/shrot8pack_180.c | 2 +- miext/shadow/shrot8pack_270.c | 2 +- miext/shadow/shrot8pack_90.c | 2 +- miext/shadow/shrotate.c | 2 +- miext/shadow/shrotpack.h | 2 +- os/WaitFor.c | 11 +- os/access.c | 60 +- os/auth.c | 2 +- os/connection.c | 2 +- os/io.c | 2 +- os/k5auth.c | 2 +- os/lbxio.c | 2 +- os/mitauth.c | 2 +- os/oscolor.c | 2 +- os/osdep.h | 2 +- os/osinit.c | 2 +- os/rpcauth.c | 2 +- os/secauth.c | 2 +- os/strlcat.c | 2 +- os/strlcpy.c | 2 +- os/utils.c | 25 +- os/xalloc.c | 4 +- os/xdmauth.c | 2 +- os/xdmcp.c | 48 +- randr/mirandr.c | 2 +- randr/randr.c | 2 +- randr/randrstr.h | 2 +- record/record.c | 3 +- record/set.c | 2 +- record/set.h | 2 +- render/animcur.c | 2 +- render/filter.c | 2 +- render/glyph.c | 2 +- render/glyphstr.h | 2 +- render/miglyph.c | 2 +- render/miindex.c | 2 +- render/mipict.c | 2 +- render/mipict.h | 2 +- render/mirect.c | 2 +- render/mitrap.c | 2 +- render/mitri.c | 2 +- render/picture.c | 2 +- render/picture.h | 4 +- render/picturestr.h | 3 +- render/render.c | 3 +- xkb/XKBAlloc.c | 2 +- xkb/XKBGAlloc.c | 2 +- xkb/XKBMAlloc.c | 2 +- xkb/XKBMisc.c | 2 +- xkb/ddxBeep.c | 2 +- xkb/ddxConfig.c | 2 +- xkb/ddxCtrls.c | 2 +- xkb/ddxDevBtn.c | 2 +- xkb/ddxFakeBtn.c | 2 +- xkb/ddxFakeMtn.c | 3 +- xkb/ddxInit.c | 2 +- xkb/ddxKeyClick.c | 2 +- xkb/ddxKillSrv.c | 2 +- xkb/ddxLEDs.c | 2 +- xkb/ddxList.c | 2 +- xkb/ddxLoad.c | 2 +- xkb/ddxPrivate.c | 2 +- xkb/ddxVT.c | 2 +- xkb/maprules.c | 2 +- xkb/xkb.c | 5 +- xkb/xkb.h | 2 +- xkb/xkbAccessX.c | 2 +- xkb/xkbActions.c | 2 +- xkb/xkbDflts.h | 2 +- xkb/xkbEvents.c | 2 +- xkb/xkbInit.c | 4 +- xkb/xkbLEDs.c | 2 +- xkb/xkbPrKeyEv.c | 2 +- xkb/xkbPrOtherEv.c | 2 +- xkb/xkbSwap.c | 2 +- xkb/xkbUtils.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 +- 1366 files changed, 7654 insertions(+), 2761 deletions(-) diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index ae3276a02..106a6464d 100644 --- a/GL/apple/aglGlx.c +++ b/GL/apple/aglGlx.c @@ -32,7 +32,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #include "quartzCommon.h" #include 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 da05fe290..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.4 2003/09/28 20:15:41 alanh 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 @@ -425,8 +425,12 @@ __GLXdispatchRenderProcPtr __glXRenderTable[] = { __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, + __glXDisp_SampleCoverageARB, +#ifndef MISSING_GL_EXTS __glXDisp_WindowPos3fARB /* 230 */ +#else + __glXNoSuchRenderOpcode +#endif }; __GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE] = { @@ -822,6 +826,10 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE] = { __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, + __glXDispSwap_SampleCoverageARB, +#ifndef MISSING_GL_EXTS __glXDispSwap_WindowPos3fARB /* 230 */ +#else + __glXNoSuchRenderOpcode +#endif }; diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h index ceeab5482..25c233ac7 100644 --- a/GL/glx/g_disptab.h +++ b/GL/glx/g_disptab.h @@ -325,6 +325,7 @@ extern void __glXDisp_MultiTexCoord4dvARB(GLbyte*); extern void __glXDisp_MultiTexCoord4fvARB(GLbyte*); extern void __glXDisp_MultiTexCoord4ivARB(GLbyte*); extern void __glXDisp_MultiTexCoord4svARB(GLbyte*); +extern void __glXDisp_SampleCoverageARB(GLbyte *); extern void __glXDisp_WindowPos3fARB(GLbyte *); extern int __glXSwapRender(__GLXclientState*, GLbyte*); @@ -621,6 +622,7 @@ extern void __glXDispSwap_MultiTexCoord4dvARB(GLbyte*); extern void __glXDispSwap_MultiTexCoord4fvARB(GLbyte*); extern void __glXDispSwap_MultiTexCoord4ivARB(GLbyte*); extern void __glXDispSwap_MultiTexCoord4svARB(GLbyte*); +extern void __glXDispSwap_SampleCoverageARB(GLbyte *); extern void __glXDispSwap_WindowPos3fARB(GLbyte *); #define __GLX_MIN_GLXCMD_OPCODE 1 diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c index 2d8caec92..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.4 2003/09/28 20:15:42 alanh 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 @@ -45,8 +45,13 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS __glXDisp_PointParameterfARB, /* 2065 */ __glXDisp_PointParameterfvARB, /* 2066 */ +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -2104,22 +2109,36 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXDisp_CopyTexSubImage1D, /* 4121 */ __glXDisp_CopyTexSubImage2D, /* 4122 */ __glXDisp_CopyTexSubImage3D, /* 4123 */ - __glXNoSuchRenderOpcode, /* 4124 */ - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, /* 4130 */ - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS + __glXDisp_FogCoordfv, /* 4124 */ + __glXDisp_FogCoorddv, /* 4125 */ + __glXDisp_SecondaryColor3bv, /* 4126 */ + __glXDisp_SecondaryColor3sv, /* 4127 */ + __glXDisp_SecondaryColor3iv, /* 4128 */ + __glXDisp_SecondaryColor3fv, /* 4129 */ + __glXDisp_SecondaryColor3dv, /* 4130 */ + __glXDisp_SecondaryColor3ubv, /* 4131 */ + __glXDisp_SecondaryColor3usv, /* 4132 */ + __glXDisp_SecondaryColor3uiv, /* 4133 */ + __glXDisp_BlendFuncSeparate, /* 4134 */ +#else + __glXNoSuchRenderOpcode, /* 4124 */ + __glXNoSuchRenderOpcode, /* 4125 */ + __glXNoSuchRenderOpcode, /* 4126 */ + __glXNoSuchRenderOpcode, /* 4127 */ + __glXNoSuchRenderOpcode, /* 4128 */ + __glXNoSuchRenderOpcode, /* 4129 */ + __glXNoSuchRenderOpcode, /* 4130 */ + __glXNoSuchRenderOpcode, /* 4131 */ + __glXNoSuchRenderOpcode, /* 4132 */ + __glXNoSuchRenderOpcode, /* 4133 */ + __glXNoSuchRenderOpcode, /* 4134 */ +#endif + __glXNoSuchRenderOpcode, /* 4135 */ + __glXNoSuchRenderOpcode, /* 4136 */ + __glXNoSuchRenderOpcode, /* 4137 */ + __glXNoSuchRenderOpcode, /* 4138 */ + __glXNoSuchRenderOpcode, /* 4139 */ __glXNoSuchRenderOpcode, /* 4140 */ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -2200,7 +2219,20 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, /* 4219 */ +#ifndef MISSING_GL_EXTS __glXDisp_ActiveStencilFaceEXT, /* 4220 */ +# ifndef __DARWIN__ + __glXDisp_PointParameteri, /* 4221 */ + __glXDisp_PointParameteriv, /* 4222 */ +# else + __glXDisp_PointParameteriNV, /* 4221 */ + __glXDisp_PointParameterivNV, /* 4222 */ +# endif +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif }; __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = { __glXDisp_AreTexturesResidentEXT, /* 11 */ @@ -2223,8 +2255,13 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS __glXDispSwap_PointParameterfARB, /* 2065 */ __glXDispSwap_PointParameterfvARB, /* 2066 */ +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -4282,22 +4319,36 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXDispSwap_CopyTexSubImage1D, /* 4121 */ __glXDispSwap_CopyTexSubImage2D, /* 4122 */ __glXDispSwap_CopyTexSubImage3D, /* 4123 */ - __glXNoSuchRenderOpcode, /* 4124 */ - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, /* 4130 */ - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, - __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS + __glXDispSwap_FogCoordfv, /* 4124 */ + __glXDispSwap_FogCoorddv, /* 4125 */ + __glXDispSwap_SecondaryColor3bv, /* 4126 */ + __glXDispSwap_SecondaryColor3sv, /* 4127 */ + __glXDispSwap_SecondaryColor3iv, /* 4128 */ + __glXDispSwap_SecondaryColor3fv, /* 4129 */ + __glXDispSwap_SecondaryColor3dv, /* 4130 */ + __glXDispSwap_SecondaryColor3ubv, /* 4131 */ + __glXDispSwap_SecondaryColor3usv, /* 4132 */ + __glXDispSwap_SecondaryColor3uiv, /* 4133 */ + __glXDisp_BlendFuncSeparate, /* 4134 */ +#else + __glXNoSuchRenderOpcode, /* 4124 */ + __glXNoSuchRenderOpcode, /* 4125 */ + __glXNoSuchRenderOpcode, /* 4126 */ + __glXNoSuchRenderOpcode, /* 4127 */ + __glXNoSuchRenderOpcode, /* 4128 */ + __glXNoSuchRenderOpcode, /* 4129 */ + __glXNoSuchRenderOpcode, /* 4130 */ + __glXNoSuchRenderOpcode, /* 4131 */ + __glXNoSuchRenderOpcode, /* 4132 */ + __glXNoSuchRenderOpcode, /* 4133 */ + __glXNoSuchRenderOpcode, /* 4134 */ +#endif + __glXNoSuchRenderOpcode, /* 4135 */ + __glXNoSuchRenderOpcode, /* 4136 */ + __glXNoSuchRenderOpcode, /* 4137 */ + __glXNoSuchRenderOpcode, /* 4138 */ + __glXNoSuchRenderOpcode, /* 4139 */ __glXNoSuchRenderOpcode, /* 4140 */ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -4378,7 +4429,20 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, /* 4219 */ +#ifndef MISSING_GL_EXTS __glXDispSwap_ActiveStencilFaceEXT, /* 4220 */ +# ifndef __DARWIN__ + __glXDispSwap_PointParameteri, /* 4221 */ + __glXDispSwap_PointParameteriv, /* 4222 */ +# else + __glXDispSwap_PointParameteriNV, /* 4221 */ + __glXDispSwap_PointParameterivNV, /* 4222 */ +# endif +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif }; __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = { __glXDispSwap_AreTexturesResidentEXT, /* 11 */ diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h index d5b67745c..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.4 2003/09/28 20:15:42 alanh 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_ @@ -69,6 +69,44 @@ extern void __glXDisp_CopyTexSubImage2D(GLbyte*); extern void __glXDisp_CopyTexSubImage3D(GLbyte*); extern void __glXDisp_PointParameterfARB(GLbyte*); extern void __glXDisp_PointParameterfvARB(GLbyte*); + +extern void __glXDisp_FogCoordfv(GLbyte *); +extern void __glXDisp_FogCoorddv(GLbyte *); +extern void __glXDispSwap_FogCoordfv(GLbyte *); +extern void __glXDispSwap_FogCoorddv(GLbyte *); + +extern void __glXDisp_SecondaryColor3bv(GLbyte *); +extern void __glXDisp_SecondaryColor3sv(GLbyte *); +extern void __glXDisp_SecondaryColor3iv(GLbyte *); +extern void __glXDisp_SecondaryColor3ubv(GLbyte *); +extern void __glXDisp_SecondaryColor3usv(GLbyte *); +extern void __glXDisp_SecondaryColor3uiv(GLbyte *); +extern void __glXDisp_SecondaryColor3fv(GLbyte *); +extern void __glXDisp_SecondaryColor3dv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3bv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3sv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3iv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3ubv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3usv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3uiv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3fv(GLbyte *); +extern void __glXDispSwap_SecondaryColor3dv(GLbyte *); + +extern void __glXDisp_BlendFuncSeparate(GLbyte *); +extern void __glXDispSwap_BlendFuncSeparate(GLbyte *); + +#ifdef __DARWIN__ +extern void __glXDisp_PointParameteriNV(GLbyte *); +extern void __glXDisp_PointParameterivNV(GLbyte *); +extern void __glXDispSwap_PointParameteriNV(GLbyte *); +extern void __glXDispSwap_PointParameterivNV(GLbyte *); +#else +extern void __glXDisp_PointParameteri(GLbyte *); +extern void __glXDisp_PointParameteriv(GLbyte *); +extern void __glXDispSwap_PointParameteri(GLbyte *); +extern void __glXDispSwap_PointParameteriv(GLbyte *); +#endif + extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*); extern int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState*, GLbyte*); @@ -112,7 +150,7 @@ extern void __glXDispSwap_PointParameterfvARB(GLbyte*); extern void __glXDispSwap_ActiveStencilFaceEXT(GLbyte*); #define __GLX_MIN_RENDER_OPCODE_EXT 2053 -#define __GLX_MAX_RENDER_OPCODE_EXT 4220 +#define __GLX_MAX_RENDER_OPCODE_EXT 4222 #define __GLX_MIN_VENDPRIV_OPCODE_EXT 11 #define __GLX_MAX_VENDPRIV_OPCODE_EXT 14 #define __GLX_VENDPRIV_TABLE_SIZE_EXT (__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1) diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c index 5e142138e..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.6 2003/10/28 22:50:17 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 @@ -59,6 +59,157 @@ void __glXDisp_Begin(GLbyte *pc) ); } +#define __GLX_SWAP_GLbyte(ptr) +#define __GLX_SWAP_GLshort(ptr) __GLX_SWAP_SHORT(ptr) +#define __GLX_SWAP_GLint(ptr) __GLX_SWAP_INT(ptr) +#define __GLX_SWAP_GLubyte(ptr) +#define __GLX_SWAP_GLushort(ptr) __GLX_SWAP_SHORT(ptr) +#define __GLX_SWAP_GLuint(ptr) __GLX_SWAP_INT(ptr) +#define __GLX_SWAP_GLdouble(ptr) __GLX_SWAP_DOUBLE(ptr) +#define __GLX_SWAP_GLfloat(ptr) __GLX_SWAP_FLOAT(ptr) + +#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) (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) +#define __GLX_SWAP_GLfloat_ARRAY(ptr,count) __GLX_SWAP_FLOAT_ARRAY(ptr,count) + +#ifdef __GLX_ALIGN64 +/* If type is not GLdouble, the compiler should optimize this away. + */ +# define GLX_DO_ALIGN_MAGIC(count, type) \ + do { \ + if ( (sizeof(type) == 8) && ((unsigned long)(pc) & 7)) \ + { \ + __GLX_MEM_COPY(pc-4, pc, (count * sizeof( type ) )); \ + pc -= 4; \ + } \ + } while( 0 ) +#else +# define GLX_DO_ALIGN_MAGIC(count, type) +#endif + +#define dispatch_template_1( name, type ) \ + void __glXDisp_ ## name ( GLbyte * pc ) \ + { \ + GLX_DO_ALIGN_MAGIC( 1, type ); \ + gl ## name ( (type *) pc ); \ + } \ + void __glXDispSwap_ ## name ( GLbyte * pc ) \ + { \ + __GLX_DECLARE_SWAP_VARIABLES; \ + GLX_DO_ALIGN_MAGIC( 1, type ); \ + __GLX_SWAP_ ## type ( pc ); \ + gl ## name ( (type *) pc ); \ + } + +#define dispatch_template_3( name, type ) \ + void __glXDisp_ ## name ( GLbyte * pc ) \ + { \ + GLX_DO_ALIGN_MAGIC( 3, type ); \ + gl ## name ( (type *) pc ); \ + } \ + void __glXDispSwap_ ## name ( GLbyte * pc ) \ + { \ + __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 ) \ + { \ + GLX_DO_ALIGN_MAGIC( 4, type ); \ + gl ## name ( ((type *) pc)[0], ((type *) pc)[1], \ + ((type *) pc)[2], ((type *) pc)[3] ); \ + } \ + 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)[0], ((type *) pc)[1], \ + ((type *) pc)[2], ((type *) pc)[3] ); \ + } + +/** + * \bug All of the enum1 templates need to be updated to handle the case where + * \c type is \c GLdouble. When the type is a double, the data comes before + * the enum. This is also the reason the invocation of the + * \c GLX_DO_ALIGN_MAGIC macro was removed. + */ +#define dispatch_template_enum1_1s( name, type ) \ + void __glXDisp_ ## name ( GLbyte * pc ) \ + { \ + gl ## name ( *(GLenum *) (pc + 0), \ + *(type *) (pc + 4) ); \ + } \ + void __glXDispSwap_ ## name ( GLbyte * pc ) \ + { \ + __GLX_DECLARE_SWAP_VARIABLES; \ + __GLX_SWAP_INT (pc + 0); \ + __GLX_SWAP_ ## type (pc + 4); \ + gl ## name ( *(GLenum *) (pc + 0), \ + *(type *) (pc + 4) ); \ + } + +#define dispatch_template_enum1_Vv( name, type ) \ + void __glXDisp_ ## name ( GLbyte * pc ) \ + { \ + gl ## name ( *(GLenum *) (pc + 0), \ + (type *) (pc + 4) ); \ + } \ + void __glXDispSwap_ ## name ( GLbyte * pc ) \ + { \ + GLenum pname; GLint compsize; \ + __GLX_DECLARE_SWAP_VARIABLES; \ + __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \ + __GLX_SWAP_INT(pc + 0); \ + pname = *(GLenum *)(pc + 0); \ + compsize = __gl ## name ## _size(pname); \ + if (compsize < 0) compsize = 0; \ + __GLX_SWAP_ ## type ## _ARRAY(pc + 4, compsize); \ + gl ## name ( *(GLenum *) (pc + 0), \ + (type *) (pc + 4) ); \ + } + +#ifndef MISSING_GL_EXTS +dispatch_template_1( FogCoordfv, GLfloat ) +dispatch_template_1( FogCoorddv, GLdouble ) +dispatch_template_3( SecondaryColor3bv, GLbyte ) +dispatch_template_3( SecondaryColor3sv, GLshort ) +dispatch_template_3( SecondaryColor3iv, GLint ) +dispatch_template_3( SecondaryColor3ubv, GLubyte ) +dispatch_template_3( SecondaryColor3usv, GLushort ) +dispatch_template_3( SecondaryColor3uiv, GLuint ) +dispatch_template_3( SecondaryColor3fv, GLfloat ) +dispatch_template_3( SecondaryColor3dv, GLdouble ) + +dispatch_template_4s( BlendFuncSeparate, GLenum ) +#endif /* !MISSING_GL_EXTS */ + void __glXDisp_Color3bv(GLbyte *pc) { glColor3bv( @@ -2079,6 +2230,8 @@ void __glXDisp_MultiTexCoord4svARB(GLbyte *pc) * Extensions */ +#ifndef MISSING_GL_EXTS + void __glXDisp_PointParameterfARB(GLbyte *pc) { glPointParameterfARB( @@ -2096,6 +2249,15 @@ void __glXDisp_PointParameterfvARB(GLbyte *pc) ); } +#ifdef __DARWIN__ +#define __glPointParameterivNV_size __glPointParameteriv_size +dispatch_template_enum1_1s(PointParameteriNV, GLint) +dispatch_template_enum1_Vv(PointParameterivNV, GLint) +#else +dispatch_template_enum1_1s(PointParameteri, GLint) +dispatch_template_enum1_Vv(PointParameteriv, GLint) +#endif + void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc) { glActiveStencilFaceEXT( @@ -2111,3 +2273,13 @@ void __glXDisp_WindowPos3fARB(GLbyte *pc) *(GLfloat *)(pc + 8) ); } + +#endif /* !MISSING_GL_EXTS */ + +void __glXDisp_SampleCoverageARB(GLbyte *pc) +{ + glSampleCoverageARB( + *(GLfloat *)(pc + 0), + *(GLboolean *)(pc + 4) + ); +} diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c index a03db7599..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.7 2003/10/28 22:50:17 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 @@ -3313,6 +3313,8 @@ void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc) * Extensions */ +#ifndef MISSING_GL_EXTS + void __glXDispSwap_PointParameterfARB(GLbyte *pc) { __GLX_DECLARE_SWAP_VARIABLES; @@ -3366,3 +3368,17 @@ void __glXDispSwap_WindowPos3fARB(GLbyte *pc) *(GLfloat *)(pc + 8) ); } + +#endif /* !MISSING_GL_EXTS */ + +void __glXDispSwap_SampleCoverageARB(GLbyte *pc) +{ + __GLX_DECLARE_SWAP_VARIABLES; + __GLX_SWAP_FLOAT(pc + 0); + __GLX_SWAP_INT(pc + 4); + + glSampleCoverageARB( + *(GLfloat *)(pc + 0), + *(GLboolean *)(pc + 4) + ); +} 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 34515997e..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.5 2002/01/14 22:47:08 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 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 12e961ee6..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.11 2003/10/28 22:50:17 tsi 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 @@ -1554,6 +1554,18 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc) req = (xGLXVendorPrivateReq *) pc; vendorcode = req->vendorCode; +#ifndef __DARWIN__ + switch( vendorcode ) { + case X_GLvop_SampleMaskSGIS: + glSampleMaskSGIS(*(GLfloat *)(pc + 4), + *(GLboolean *)(pc + 8)); + return Success; + case X_GLvop_SamplePatternSGIS: + glSamplePatternSGIS( *(GLenum *)(pc + 4)); + return Success; + } +#endif + if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) && (vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT)) { (*__glXVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT]) diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index 5237ecad0..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.9 2003/10/28 22:50:17 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 @@ -791,6 +791,21 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc) vendorcode = req->vendorCode; +#ifndef __DARWIN__ + switch( vendorcode ) { + case X_GLvop_SampleMaskSGIS: + __GLX_SWAP_FLOAT(pc + 4); + __GLX_SWAP_INT(pc + 8); + glSampleMaskSGIS(*(GLfloat *)(pc + 4), + *(GLboolean *)(pc + 8)); + return Success; + case X_GLvop_SamplePatternSGIS: + __GLX_SWAP_INT(pc + 4); + glSamplePatternSGIS( *(GLenum *)(pc + 4)); + return Success; + } +#endif + if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) && (vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT)) { (*__glXSwapVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT])(cl, (GLbyte*)req); 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 716950953..796663e9b 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -31,6 +31,9 @@ extern __GLXextensionInfo __glDDXExtensionInfo; +void GlxWrapInitVisuals(miInitVisualsProcPtr *); +void GlxSetVisualConfigs(int nconfigs, + __GLXvisualConfig *configs, void **privates); __GLXextensionInfo *__glXExt = &__glDDXExtensionInfo; diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index 4ec16d28d..210fbb88c 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -80,6 +80,9 @@ extern void GlxExtensionInit(void); extern Bool __glXCoreType(void); +extern const char GLServerVersion[]; +extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap); + extern int GlxInitVisuals( VisualPtr * visualp, DepthPtr * depthp, 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 c141d3cea..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.12 2003/09/28 20:15:43 alanh 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 @@ -46,11 +46,13 @@ #include "glxserver.h" #include "glxutil.h" +const char GLServerVersion[] = "1.2"; static const char GLServerExtensions[] = "GL_ARB_depth_texture " "GL_ARB_imaging " "GL_ARB_multitexture " "GL_ARB_point_parameters " + "GL_ARB_point_sprite " "GL_ARB_shadow " "GL_ARB_shadow_ambient " "GL_ARB_texture_border_clamp " @@ -108,6 +110,7 @@ static const char GLServerExtensions[] = "GL_MESA_pack_invert " "GL_MESA_ycbcr_texture " "GL_NV_blend_square " + "GL_NV_point_sprite " "GL_NV_texgen_reflection " "GL_NV_texture_rectangle " "GL_SGIS_generate_mipmap " @@ -125,11 +128,15 @@ static const char GLServerExtensions[] = */ static char GLXServerVendorName[] = "SGI"; static char GLXServerVersion[] = "1.2"; -static char GLXServerExtensions[] = +static char GLXServerExtensions[] = + "GLX_ARB_multisample " "GLX_EXT_visual_info " "GLX_EXT_visual_rating " "GLX_EXT_import_context " "GLX_SGI_make_current_read " +#ifndef __DARWIN__ + "GLX_SGIS_multisample " +#endif ; /* 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 a800f0d73..be9e40f5a 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -280,5 +280,6 @@ extern int __glXColorTableParameterfvSize(GLenum pname); extern int __glXColorTableParameterivSize(GLenum pname); extern int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap); +extern int __glXPointParameterivReqSize(GLbyte *pc, Bool swap); #endif /* !__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 c923441c2..894391003 100644 --- a/GL/glx/impsize.h +++ b/GL/glx/impsize.h @@ -67,6 +67,7 @@ extern int __glTexParameterfv_size(GLenum e); extern int __glTexParameteriv_size(GLenum e); extern int __glEvalComputeK(GLenum target); -extern int __glPointParameterfvARB_size(GLenum pname); +extern int __glPointParameterfvARB_size(GLenum e); +extern int __glPointParameteriv_size(GLenum e); #endif /* _impsize_h_ */ diff --git a/GL/glx/render2.c b/GL/glx/render2.c index 7189f9710..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.6 2003/10/28 22:50:18 tsi 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 @@ -234,6 +234,16 @@ void __glXDisp_DrawArrays(GLbyte *pc) glEnableClientState(GL_EDGE_FLAG_ARRAY); glEdgeFlagPointer(stride, (const GLboolean *)pc); break; +#ifndef MISSING_GL_EXTS + case GL_SECONDARY_COLOR_ARRAY: + glEnableClientState(GL_SECONDARY_COLOR_ARRAY); + glSecondaryColorPointer(numVals, datatype, stride, pc); + break; + case GL_FOG_COORDINATE_ARRAY: + glEnableClientState(GL_FOG_COORDINATE_ARRAY); + glFogCoordPointer(datatype, stride, pc); + break; +#endif default: break; } @@ -250,10 +260,11 @@ void __glXDisp_DrawArrays(GLbyte *pc) glDisableClientState(GL_INDEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); glDisableClientState(GL_EDGE_FLAG_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glDisableClientState(GL_FOG_COORDINATE_ARRAY); } void __glXDisp_DrawArraysEXT(GLbyte *pc) { -#ifdef XXX_STUB -#endif /*XXX_STUB*/ + __glXDisp_DrawArrays(pc); } diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c index e873d88aa..7c94b5268 100644 --- a/GL/glx/render2swap.c +++ b/GL/glx/render2swap.c @@ -386,6 +386,5 @@ void __glXDispSwap_DrawArrays(GLbyte *pc) void __glXDispSwap_DrawArraysEXT(GLbyte *pc) { -#ifdef XXX_STUB -#endif /*XXX_STUB*/ + __glXDispSwap_DrawArrays(pc); } 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 0a3e537f8..aa784b5fc 100644 --- a/GL/glx/rensize.c +++ b/GL/glx/rensize.c @@ -551,12 +551,14 @@ int __glXDrawArraysSize( GLbyte *pc, Bool swap ) case GL_COLOR_ARRAY: case GL_TEXTURE_COORD_ARRAY: break; + case GL_SECONDARY_COLOR_ARRAY: case GL_NORMAL_ARRAY: if (numVals != 3) { /* bad size */ return -1; } break; + case GL_FOG_COORDINATE_ARRAY: case GL_INDEX_ARRAY: if (numVals != 1) { /* bad size */ @@ -918,3 +920,9 @@ int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap ) } return 4 * __glPointParameterfvARB_size( pname ); } + +int __glXPointParameterivReqSize(GLbyte *pc, Bool swap ) +{ + /* no difference between fv and iv versions */ + return __glXPointParameterfvARBReqSize(pc, swap); +} diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c index c787366fa..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.4 2003/09/28 20:15:43 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 @@ -231,9 +231,9 @@ __GLXrenderSizeData __glXRenderSizeTable[__GLX_MAX_RENDER_OPCODE_EXT - __GLX_MIN /* Translatef */ { 16, 0 }, /* Viewport */ { 20, 0 }, /* PolygonOffset */ { 12, 0 }, - /* no such opcode */ { 0, 0 }, + /* DrawArrays */ { 16, __glXDrawArraysSize }, /* Indexubv */ { 8, 0 }, - /* ColorSubTable */ { 44, __glXColorSubTableReqSize }, + /* ColorSubTable */ { 44, __glXColorSubTableReqSize }, /* CopyColorSubTable */ { 24, 0 }, /* ActiveTextureARB */ { 8, 0 }, /* MultiTexCoord1dvARB */ { 16, 0 }, @@ -2342,17 +2342,17 @@ __GLXrenderSizeData __glXRenderSizeTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __GLX /* CopyTexSubImage1D */ { 28, 0 }, /* CopyTexSubImage2D */ { 36, 0 }, /* CopyTexSubImage3D 4123 */ { 40, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, - /* no such opcode */ { 0, 0 }, + /* FogCoordfv 4124 */ { 8, 0 }, + /* FogCoorddv 4125 */ { 12, 0 }, + /* SecondaryColor3bv 4126 */ { 8, 0 }, + /* SecondaryColor3sv 4127 */ { 12, 0 }, + /* SecondaryColor3iv 4128 */ { 16, 0 }, + /* SecondaryColor3fv 4129 */ { 16, 0 }, + /* SecondaryColor3dv 4130 */ { 28, 0 }, + /* SecondaryColor3ubv 4131 */ { 8, 0 }, + /* SecondaryColor3usv 4132 */ { 12, 0 }, + /* SecondaryColor3uiv 4133 */ { 16, 0 }, + /* BlendFuncSeparate 4134 */ { 20, 0 }, /* no such opcode */ { 0, 0 }, /* no such opcode */ { 0, 0 }, /* no such opcode */ { 0, 0 }, @@ -2439,4 +2439,6 @@ __GLXrenderSizeData __glXRenderSizeTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __GLX /* no such opcode */ { 0, 0 }, /* no such opcode */ { 0, 0 }, /* ActiveStencilFaceEXT 4220 */ { 8, 0 }, + /* PointParameteri 4221 */ { 12, 0 }, + /* PointParameteriv 4222 */ { 8, __glXPointParameterivReqSize }, }; diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 286f63d70..c757d60bd 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.6 2001/06/06 19:00:15 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 @@ -296,16 +296,25 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string) return combo_string; } -int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc) +int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap) { ClientPtr client; __GLXcontext *cx; GLenum name; const char *string; + __GLX_DECLARE_SWAP_VARIABLES; int error; char *buf = NULL, *buf1 = NULL; GLint length = 0; + /* If the client has the opposite byte order, swap the contextTag and + * the name. + */ + if ( need_swap ) { + __GLX_SWAP_INT(pc + 4); + __GLX_SWAP_INT(pc + __GLX_SINGLE_HDR_SIZE); + } + cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error); if (!cx) { return error; @@ -331,12 +340,32 @@ int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc) } string = buf; } + else if ( name == GL_VERSION ) { + if ( atof( string ) > atof( GLServerVersion ) ) { + buf = __glXMalloc( __glXStrlen( string ) + + __glXStrlen( GLServerVersion ) + + 3 ); + if ( buf == NULL ) { + string = GLServerVersion; + } + else { + __glXSprintf( buf, "%s (%s)", GLServerVersion, string ); + string = buf; + } + } + } if (string) { length = __glXStrlen((const char *) string) + 1; } __GLX_BEGIN_REPLY(length); __GLX_PUT_SIZE(length); + + if ( need_swap ) { + __GLX_SWAP_REPLY_SIZE(); + __GLX_SWAP_REPLY_HEADER(); + } + __GLX_SEND_HEADER(); WriteToClient(client, length, (char *) string); if (buf != NULL) { @@ -345,6 +374,11 @@ int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc) return Success; } +int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc) +{ + return DoGetString(cl, pc, GL_FALSE); +} + int __glXDisp_GetClipPlane(__GLXclientState *cl, GLbyte *pc) { __GLXcontext *cx; diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index 96db415f9..c8c496871 100644 --- a/GL/glx/single2swap.c +++ b/GL/glx/single2swap.c @@ -262,58 +262,7 @@ int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc) int __glXDispSwap_GetString(__GLXclientState *cl, GLbyte *pc) { - ClientPtr client; - __GLXcontext *cx; - GLenum name; - const char *string; - __GLX_DECLARE_SWAP_VARIABLES; - int error; - char *buf = NULL, *buf1 = NULL; - GLint length = 0; - - __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); - cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error); - if (!cx) { - return error; - } - - pc += __GLX_SINGLE_HDR_SIZE; - __GLX_SWAP_INT(pc + 0); - name = *(GLenum *)(pc + 0); - string = (const char *)glGetString(name); - client = cl->client; - - /* - ** Restrict extensions to those that are supported by both the - ** implementation and the connection. That is, return the - ** intersection of client, server, and core extension strings. - */ - if (name == GL_EXTENSIONS) { - buf1 = __glXcombine_strings(string, - cl->GLClientextensions); - buf = __glXcombine_strings(buf1, - cx->pGlxScreen->GLextensions); - if (buf1 != NULL) { - __glXFree(buf1); - } - string = buf; - } - if (string) { - length = __glXStrlen((const char *) string) + 1; - } - - __GLX_BEGIN_REPLY(length); - __GLX_PUT_SIZE(length); - - __GLX_SWAP_REPLY_SIZE(); - __GLX_SWAP_REPLY_HEADER(); - __GLX_SEND_HEADER(); - WriteToClient(client, length, (char *) string); - if (buf != NULL) { - __glXFree(buf); - } - - return Success; + return DoGetString(cl, pc, GL_TRUE); } int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc) 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 efb13ee94..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.6 2003/11/06 18:37:56 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 @@ -50,32 +50,48 @@ GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h) return __glXImage3DSize( format, type, w, h, 1, 0, 0, 0, 0, 4 ); } +/** + * Determine the number of data elements that go with the specified \c pname + * to a \c glGetTexEnvfv or \c glGetTexEnviv call. + * + * \todo + * Replace this function with a call to \c __glTexEnvfv_size. Make that there + * aren't any values of \c pname that are valid for one but not the other. + */ GLint __glGetTexEnvfv_size(GLenum pname) { switch (pname) { case GL_TEXTURE_ENV_MODE: + case GL_TEXTURE_LOD_BIAS: + case GL_COMBINE_RGB: + case GL_COMBINE_ALPHA: + case GL_SOURCE0_RGB: + case GL_SOURCE1_RGB: + case GL_SOURCE2_RGB: + case GL_SOURCE0_ALPHA: + case GL_SOURCE1_ALPHA: + case GL_SOURCE2_ALPHA: + case GL_OPERAND0_RGB: + case GL_OPERAND1_RGB: + case GL_OPERAND2_RGB: + case GL_OPERAND0_ALPHA: + case GL_OPERAND1_ALPHA: + case GL_OPERAND2_ALPHA: + case GL_RGB_SCALE: + case GL_ALPHA_SCALE: + + /* GL_ARB_point_sprite / GL_NV_point_sprite */ + case GL_COORD_REPLACE_NV: + + /* GL_NV_texture_env_combine4 */ + case GL_SOURCE3_RGB_NV: + case GL_SOURCE3_ALPHA_NV: + case GL_OPERAND3_RGB_NV: + case GL_OPERAND3_ALPHA_NV: return 1; + case GL_TEXTURE_ENV_COLOR: return 4; - case GL_TEXTURE_LOD_BIAS_EXT: - return 1; - case GL_COMBINE_RGB_ARB: - case GL_COMBINE_ALPHA_ARB: - case GL_SOURCE0_RGB_ARB: - case GL_SOURCE1_RGB_ARB: - case GL_SOURCE2_RGB_ARB: - case GL_SOURCE0_ALPHA_ARB: - case GL_SOURCE1_ALPHA_ARB: - case GL_SOURCE2_ALPHA_ARB: - case GL_OPERAND0_RGB_ARB: - case GL_OPERAND1_RGB_ARB: - case GL_OPERAND2_RGB_ARB: - case GL_OPERAND0_ALPHA_ARB: - case GL_OPERAND1_ALPHA_ARB: - case GL_OPERAND2_ALPHA_ARB: - case GL_RGB_SCALE_ARB: - case GL_ALPHA_SCALE: - return 1; default: return -1; } @@ -140,6 +156,15 @@ GLint __glGetTexParameterfv_size(GLenum pname) case GL_TEXTURE_COMPARE_MODE: case GL_TEXTURE_COMPARE_FUNC: + /* GL_SGIS_generate_mipmap / GL 1.4 */ + case GL_GENERATE_MIPMAP: + + /* GL_ARB_depth_texture / GL 1.4 */ + case GL_DEPTH_TEXTURE_MODE: + + /* GL_EXT_texture_lod_bias / GL 1.4 */ + case GL_TEXTURE_LOD_BIAS: + /* GL_SGIX_shadow_ambient / GL_ARB_shadow_ambient */ case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: @@ -151,6 +176,9 @@ GLint __glGetTexParameterfv_size(GLenum pname) case GL_TEXTURE_MAX_CLAMP_S_SGIX: case GL_TEXTURE_MAX_CLAMP_T_SGIX: case GL_TEXTURE_MAX_CLAMP_R_SGIX: + + /* GL_EXT_texture_filter_anisotropic */ + case GL_TEXTURE_MAX_ANISOTROPY_EXT: return 1; default: @@ -834,10 +862,6 @@ GLint __glGet_size(GLenum sq) case GL_MAX_CONVOLUTION_WIDTH: case GL_MAX_CONVOLUTION_HEIGHT: return 1; - case GL_TEXTURE_CUBE_MAP_ARB: - case GL_TEXTURE_BINDING_CUBE_MAP_ARB: - case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: - return 1; case GL_OCCLUSION_TEST_RESULT_HP: case GL_OCCLUSION_TEST_HP: return 1; @@ -847,6 +871,183 @@ GLint __glGet_size(GLenum sq) return 1; case GL_RASTER_POSITION_UNCLIPPED_IBM: return 1; + + /* GL_ARB_texture_cube_map / GL 1.3 */ + case GL_TEXTURE_CUBE_MAP: + case GL_TEXTURE_BINDING_CUBE_MAP: + case GL_MAX_CUBE_MAP_TEXTURE_SIZE: + + /* GL_ARB_multisample / GL 1.3 */ + case GL_MULTISAMPLE: + case GL_SAMPLE_ALPHA_TO_COVERAGE: + case GL_SAMPLE_ALPHA_TO_ONE: + case GL_SAMPLE_COVERAGE: + case GL_SAMPLE_BUFFERS: + case GL_SAMPLES: + case GL_SAMPLE_COVERAGE_VALUE: + case GL_SAMPLE_COVERAGE_INVERT: + + /* GL_ARB_texture_comrpession / GL 1.3 */ + case GL_TEXTURE_COMPRESSION_HINT: + case GL_NUM_COMPRESSED_TEXTURE_FORMATS: + + /* GL_EXT_blend_func_separate / GL 1.4 */ + case GL_BLEND_DST_RGB: + case GL_BLEND_SRC_RGB: + case GL_BLEND_DST_ALPHA: + case GL_BLEND_SRC_ALPHA: + + /* GL_EXT_fog_coord / GL 1.4 */ + case GL_CURRENT_FOG_COORDINATE: + case GL_FOG_COORDINATE_ARRAY_TYPE: + case GL_FOG_COORDINATE_ARRAY_STRIDE: + case GL_FOG_COORDINATE_ARRAY: + case GL_FOG_COORDINATE_SOURCE: + + /* GL_EXT_secondary_color / GL 1.4 */ + case GL_COLOR_SUM: + case GL_SECONDARY_COLOR_ARRAY_SIZE: + case GL_SECONDARY_COLOR_ARRAY_TYPE: + case GL_SECONDARY_COLOR_ARRAY_STRIDE: + case GL_SECONDARY_COLOR_ARRAY: + + /* GL_EXT_texture_lod_bias / GL 1.4 */ + case GL_MAX_TEXTURE_LOD_BIAS: + + /* GL_ARB_point_sprite */ + case GL_POINT_SPRITE_NV: + + /* GL_ARB_vertex_blend */ + case GL_MAX_VERTEX_UNITS_ARB: + case GL_ACTIVE_VERTEX_UNITS_ARB: + case GL_WEIGHT_SUM_UNITY_ARB: + case GL_VERTEX_BLEND_ARB: + case GL_CURRENT_WEIGHT_ARB: + case GL_WEIGHT_ARRAY_ARB: + case GL_WEIGHT_ARRAY_TYPE_ARB: + case GL_WEIGHT_ARRAY_STRIDE_ARB: + case GL_WEIGHT_ARRAY_SIZE_ARB: + + /* GL_ARB_matrix_palette */ + case GL_MATRIX_PALETTE_ARB: + case GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB: + case GL_MAX_PALETTE_MATRICES_ARB: + case GL_CURRENT_PALETTE_MATRIX_ARB: + case GL_CURRENT_MATRIX_INDEX_ARB: + case GL_MATRIX_INDEX_ARRAY_ARB: + case GL_MATRIX_INDEX_ARRAY_SIZE_ARB: + case GL_MATRIX_INDEX_ARRAY_TYPE_ARB: + case GL_MATRIX_INDEX_ARRAY_STRIDE_ARB: + + /* GL_EXT_clip_volume_hint */ + case GL_CLIP_VOLUME_CLIPPING_HINT_EXT: + + /* GL_EXT_stencil_two_size */ + case GL_STENCIL_TEST_TWO_SIDE_EXT: + case GL_ACTIVE_STENCIL_FACE_EXT: + + /* GL_EXT_vertex_weighting */ + case GL_VERTEX_WEIGHTING_EXT: + case GL_MODELVIEW0_EXT: + case GL_MODELVIEW1_EXT: + case GL_CURRENT_VERTEX_WEIGHT_EXT: + case GL_VERTEX_WEIGHT_ARRAY_EXT: + case GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT: + case GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT: + case GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT: + /* case GL_MODELVIEW0_STACK_DEPTH_EXT: */ /* alias */ + case GL_MODELVIEW1_STACK_DEPTH_EXT: + + /* GL_ATI_vertex_streams */ + case GL_MAX_VERTEX_STREAMS_ATI: + + /* GL_NV_depth_clamp */ + case GL_DEPTH_CLAMP_NV: + + /* GL_NV_fog_distance */ + case GL_FOG_DISTANCE_MODE_NV: + + /* GL_NV_light_max_exponent */ + case GL_MAX_SHININESS_NV: + case GL_MAX_SPOT_EXPONENT_NV: + + /* GL_NV_multisample_filter_hint */ + case GL_MULTISAMPLE_FILTER_HINT_NV: + + /* GL_NV_point_sprite */ + /* case GL_POINT_SPRITE_NV: */ /* alias */ + case GL_POINT_SPRITE_R_MODE_NV: + + /* GL_NV_register_combiners */ + case GL_REGISTER_COMBINERS_NV: + case GL_NUM_GENERAL_COMBINERS_NV: + case GL_COLOR_SUM_CLAMP_NV: + case GL_MAX_GENERAL_COMBINERS_NV: + + /* GL_NV_register_combiners2 */ + case GL_PER_STAGE_CONSTANTS_NV: + + /* GL_NV_texture_rectangle */ + case GL_TEXTURE_RECTANGLE_NV: + case GL_TEXTURE_BINDING_RECTANGLE_NV: + case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV: + return 1; + + /* GL_EXT_secondary_color / GL 1.4 */ + case GL_CURRENT_SECONDARY_COLOR: + + /* GL_NV_register_combiners */ + case GL_CONSTANT_COLOR0_NV: + case GL_CONSTANT_COLOR1_NV: + return 4; + + /* GL_ARB_vertex_blend */ + /* case GL_MODELVIEW0_ARB: */ /* alias */ + /* case GL_MODELVIEW1_ARB: */ /* alias */ + case GL_MODELVIEW2_ARB: + case GL_MODELVIEW3_ARB: + case GL_MODELVIEW4_ARB: + case GL_MODELVIEW5_ARB: + case GL_MODELVIEW6_ARB: + case GL_MODELVIEW7_ARB: + case GL_MODELVIEW8_ARB: + case GL_MODELVIEW9_ARB: + case GL_MODELVIEW10_ARB: + case GL_MODELVIEW11_ARB: + case GL_MODELVIEW12_ARB: + case GL_MODELVIEW13_ARB: + case GL_MODELVIEW14_ARB: + case GL_MODELVIEW15_ARB: + case GL_MODELVIEW16_ARB: + case GL_MODELVIEW17_ARB: + case GL_MODELVIEW18_ARB: + case GL_MODELVIEW19_ARB: + case GL_MODELVIEW20_ARB: + case GL_MODELVIEW21_ARB: + case GL_MODELVIEW22_ARB: + case GL_MODELVIEW23_ARB: + case GL_MODELVIEW24_ARB: + case GL_MODELVIEW25_ARB: + case GL_MODELVIEW26_ARB: + case GL_MODELVIEW27_ARB: + case GL_MODELVIEW28_ARB: + case GL_MODELVIEW29_ARB: + case GL_MODELVIEW30_ARB: + case GL_MODELVIEW31_ARB: + + /* GL_EXT_vertex_weighting */ + /* case GL_MODELVIEW0_MATRIX_EXT: */ /* alias */ + case GL_MODELVIEW1_MATRIX_EXT: + return 32; + + /* GL_ARB_texture_comrpession / GL 1.3 */ + case GL_COMPRESSED_TEXTURE_FORMATS: { + GLint temp; + + glGetIntegerv( GL_NUM_COMPRESSED_TEXTURE_FORMATS, & temp ); + return temp; + } + default: return -1; } @@ -886,7 +1087,15 @@ GLint __glGetTexLevelParameterfv_size(GLenum pname) case GL_TEXTURE_ALPHA_SIZE: case GL_TEXTURE_LUMINANCE_SIZE: case GL_TEXTURE_INTENSITY_SIZE: + + /* GL_ARB_texture_compression / GL 1.3 */ + case GL_TEXTURE_COMPRESSED_IMAGE_SIZE: + case GL_TEXTURE_COMPRESSED: + + /* GL_ARB_depth_texture / GL 1.4 */ + case GL_TEXTURE_DEPTH_SIZE: return 1; + default: return -1; } 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 62fc43761..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.5 2002/10/30 12:52:03 alanh 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__ 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..4fe54e1da 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: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.3.2.3 2004/03/04 20:15:59 kaleb Exp $ */ +/* $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 584c32b22..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.11 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ #include "X.h" #include "Xproto.h" @@ -189,7 +189,8 @@ ProcDPMSSetTimeouts(client) DPMSStandbyTime = stuff->standby * MILLI_PER_SECOND; DPMSSuspendTime = stuff->suspend * MILLI_PER_SECOND; DPMSOffTime = stuff->off * MILLI_PER_SECOND; - + SetDPMSTimers(); + return(client->noClientException); } 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..65b77948f 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: xc/programs/Xserver/Xext/panoramiX.h,v 1.1.4.1.4.2 2004/03/08 00:36:56 alanc Exp $ */ +/***************************************************************** + +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 944009773..84eb7f294 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.3.2.2 2004/03/04 17:47:20 eich Exp $ */ /* * $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.8 2003/11/17 22:20:26 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 diff --git a/Xext/security.c b/Xext/security.c index 568138e36..a5b8e6604 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.1.4.3.4.1 2004/03/04 17:47:20 eich Exp $ */ /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* @@ -24,12 +25,13 @@ 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.16 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */ #include "dixstruct.h" #include "extnsionst.h" #include "windowstr.h" #include "inputstr.h" +#include "scrnintstr.h" #include "gcstruct.h" #include "colormapst.h" #include "propertyst.h" diff --git a/Xext/shape.c b/Xext/shape.c index 956a8ebfc..eccfabac8 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: xc/programs/Xserver/Xext/shape.c,v 1.1.4.4.2.3 2004/03/04 20:16:01 kaleb Exp $ */ +/* $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 9591eab54..fb8a66694 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.5.2.3 2004/03/04 20:16:01 kaleb 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 c024f7be8..dd429649d 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.8 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.1.4.1.6.2 2004/03/08 23:40:19 alanc Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -52,22 +53,23 @@ ProcXResQueryClients (ClientPtr client) /* REQUEST(xXResQueryClientsReq); */ xXResQueryClientsReply rep; int *current_clients; - int i; + int i, num_clients; REQUEST_SIZE_MATCH(xXResQueryClientsReq); current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int)); - rep.num_clients = 0; + num_clients = 0; for(i = 1; i < currentMaxClients; i++) { if(clients[i]) { - current_clients[rep.num_clients] = i; - rep.num_clients++; + current_clients[num_clients] = i; + num_clients++; } } rep.type = X_Reply; rep.sequenceNumber = client->sequence; + rep.num_clients = num_clients; rep.length = rep.num_clients * sz_xXResClient >> 2; if (client->swapped) { int n; @@ -77,10 +79,10 @@ ProcXResQueryClients (ClientPtr client) } WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep); - if(rep.num_clients) { + if(num_clients) { xXResClient scratch; - for(i = 0; i < rep.num_clients; i++) { + for(i = 0; i < num_clients; i++) { scratch.resource_base = clients[current_clients[i]]->clientAsMask; scratch.resource_mask = RESOURCE_ID_MASK; @@ -112,7 +114,7 @@ ProcXResQueryClientResources (ClientPtr client) { REQUEST(xXResQueryClientResourcesReq); xXResQueryClientResourcesReply rep; - int i, clientID; + int i, clientID, num_types; int *counts; REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq); @@ -132,14 +134,15 @@ ProcXResQueryClientResources (ClientPtr client) FindAllClientResources(clients[clientID], ResFindAllRes, counts); - rep.num_types = 0; + num_types = 0; for(i = 0; i <= lastResourceType; i++) { - if(counts[i]) rep.num_types++; + if(counts[i]) num_types++; } rep.type = X_Reply; rep.sequenceNumber = client->sequence; + rep.num_types = num_types; rep.length = rep.num_types * sz_xXResType >> 2; if (client->swapped) { int n; @@ -149,7 +152,7 @@ ProcXResQueryClientResources (ClientPtr client) } WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep); - if(rep.num_types) { + if(num_types) { xXResType scratch; for(i = 0; i < lastResourceType; i++) { diff --git a/Xext/xtest.c b/Xext/xtest.c index 89bcae3a4..09d135044 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.4.2.2 2004/03/04 17:47:20 eich Exp $ */ /* $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 74418606a..47e60f6b6 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.1.4.3.4.1 2004/03/04 17:47:20 eich 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 @@ -76,8 +77,6 @@ University of California. #include "xtest1dd.h" -#include "xtest1dd.h" - /***************************************************************************** * defines ****************************************************************************/ diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 40313470c..8e6ea19b1 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3.2.2 2004/03/04 17:47:20 eich Exp $ */ /*********************************************************** 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..188eb77be 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.3.2.2 2004/03/04 17:47:20 eich Exp $ */ /*********************************************************** 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/Xprint/AttrValid.c b/Xprint/AttrValid.c index 83d6b9674..a3046c159 100644 --- a/Xprint/AttrValid.c +++ b/Xprint/AttrValid.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.4 2001/01/17 22:36:27 dawes Exp $ */ #include diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 87ab48b69..8e431c285 100644 --- a/Xprint/AttrValid.h +++ b/Xprint/AttrValid.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h index 3830c20d2..d6364af26 100644 --- a/Xprint/DiPrint.h +++ b/Xprint/DiPrint.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.3 1999/12/16 02:26:24 robin Exp $ */ /* * The XpDiListEntry struct is the type of each element of the array diff --git a/Xprint/Init.c b/Xprint/Init.c index c936f4542..0deafda7c 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -50,7 +50,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.14tsi Exp $ */ #include #include diff --git a/Xprint/Oid.c b/Xprint/Oid.c index 4c23a6e09..311d177d0 100644 --- a/Xprint/Oid.c +++ b/Xprint/Oid.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.5tsi Exp $ */ #include "attributes.h" diff --git a/Xprint/Oid.h b/Xprint/Oid.h index c5574b06e..e2a97869f 100644 --- a/Xprint/Oid.h +++ b/Xprint/Oid.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.3 1999/12/16 02:26:24 robin Exp $ */ #ifndef _Xp_Oid_h #define _Xp_Oid_h diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h index 3aab300dc..6489ae533 100644 --- a/Xprint/OidStrs.h +++ b/Xprint/OidStrs.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ static int XpOidStringMapCount = 127; diff --git a/Xprint/Util.c b/Xprint/Util.c index 9e0bdf925..1f4a14666 100644 --- a/Xprint/Util.c +++ b/Xprint/Util.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in */ #if defined(linux) && defined(__STRICT_ANSI__) diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 327cb468c..983e5c1c4 100644 --- a/Xprint/ValTree.c +++ b/Xprint/ValTree.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "scrnintstr.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index ec60f3032..c75af1a88 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/Xprint/attributes.c,v 1.1.4.3.4.1 2004/03/04 17:47:23 eich Exp $ */ /* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company @@ -52,7 +53,7 @@ copyright holders. #include #include #include -#if defined(sun) && defined(SVR4) +#if (defined(sun) && defined(SVR4)) || (defined(SCO)) #include #endif diff --git a/Xprint/attributes.h b/Xprint/attributes.h index d9d551f32..b43d76af5 100644 --- a/Xprint/attributes.h +++ b/Xprint/attributes.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.5 2001/08/01 00:44:45 tsi Exp $ */ #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 97cdf815a..02e5ea370 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.13 2001/06/11 16:59:02 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index 7bb08b412..b24f5c6c0 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index 2af1b2c41..f11cc7a6c 100644 --- a/Xprint/pcl/Pcl.h +++ b/Xprint/pcl/Pcl.h @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PCL_H_ #define _PCL_H_ diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c index ca13b3a84..af32eb619 100644 --- a/Xprint/pcl/PclArc.c +++ b/Xprint/pcl/PclArc.c @@ -45,7 +45,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ #include #include diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c index 971506da6..00e6aff04 100644 --- a/Xprint/pcl/PclArea.c +++ b/Xprint/pcl/PclArea.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c index c279c8024..d5d2e022b 100644 --- a/Xprint/pcl/PclColor.c +++ b/Xprint/pcl/PclColor.c @@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c index 7e463d498..e7288c9ec 100644 --- a/Xprint/pcl/PclCursor.c +++ b/Xprint/pcl/PclCursor.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #include diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c index f2141f9ff..d5eff48c7 100644 --- a/Xprint/pcl/PclFonts.c +++ b/Xprint/pcl/PclFonts.c @@ -13,7 +13,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86$ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c index e1fe772bd..67331a454 100644 --- a/Xprint/pcl/PclGC.c +++ b/Xprint/pcl/PclGC.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ #include "gcstruct.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index 5ee49631e..460c11eb6 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -76,7 +76,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c index 3c10f97ca..aa72e8ff0 100644 --- a/Xprint/pcl/PclLine.c +++ b/Xprint/pcl/PclLine.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ #include "Pcl.h" #include "gcstruct.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 5b0939df2..63caa0fe5 100644 --- a/Xprint/pcl/PclMisc.c +++ b/Xprint/pcl/PclMisc.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c index 238a159ab..372a54e9f 100644 --- a/Xprint/pcl/PclPixel.c +++ b/Xprint/pcl/PclPixel.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ #include diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c index ba91fc9ec..178289bc1 100644 --- a/Xprint/pcl/PclPixmap.c +++ b/Xprint/pcl/PclPixmap.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #include "Pcl.h" #include "cfb.h" diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c index a5de77399..ddfd9ef8a 100644 --- a/Xprint/pcl/PclPolygon.c +++ b/Xprint/pcl/PclPolygon.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index aa2164c92..70c788eac 100644 --- a/Xprint/pcl/PclPrint.c +++ b/Xprint/pcl/PclPrint.c @@ -43,7 +43,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c index d1ad8dc29..121ed0077 100644 --- a/Xprint/pcl/PclSFonts.c +++ b/Xprint/pcl/PclSFonts.c @@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ #include @@ -58,7 +58,6 @@ static short tmp2; #define ESC 0x1b #define SYMBOL_SET 277 -#define MAX_CINDEX 255 static unsigned int PclDownloadChar(FILE *,PclCharDataPtr,unsigned short,unsigned char); static unsigned int PclDownloadHeader(FILE *, PclFontDescPtr, unsigned short); @@ -117,8 +116,6 @@ PclDownloadSoftFont16( } pfh->index[row][col].fid = pfh->cur_fid; pfh->index[row][col].cindex = pfh->cur_cindex++; - if ( pfh->cur_cindex > MAX_CINDEX ) - pfh->cur_cindex = 0; PclDownloadChar(fp, pcd, pfh->index[row][col].fid, pfh->index[row][col].cindex); } diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c index 98c17dcf9..92261c977 100644 --- a/Xprint/pcl/PclSpans.c +++ b/Xprint/pcl/PclSpans.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index 48b468427..9ef4c505f 100644 --- a/Xprint/pcl/PclText.c +++ b/Xprint/pcl/PclText.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ #ifdef DO_TWO_BYTE_PCL #include "iconv.h" diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c index 27d8ea97d..42a6f6234 100644 --- a/Xprint/pcl/PclWindow.c +++ b/Xprint/pcl/PclWindow.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ #include diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h index 1386b0ab4..1a68faf1e 100644 --- a/Xprint/pcl/Pclmap.h +++ b/Xprint/pcl/Pclmap.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ #ifndef _PCLMAP_H_ #define _PCLMAP_H_ diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 7b0aaeb39..d33f301fa 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.13 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c index a6a375487..4a7865af6 100644 --- a/Xprint/ps/PsAttVal.c +++ b/Xprint/ps/PsAttVal.c @@ -32,7 +32,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.4 2001/01/17 22:36:31 dawes Exp $ */ #include "Ps.h" #include "AttrValid.h" diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c index 13c4e1978..f276c180f 100644 --- a/Xprint/ps/PsAttr.c +++ b/Xprint/ps/PsAttr.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c index 92082226f..6417410ee 100644 --- a/Xprint/ps/PsColor.c +++ b/Xprint/ps/PsColor.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.2 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c index 9792dae4d..1f87f7e76 100644 --- a/Xprint/ps/PsFonts.c +++ b/Xprint/ps/PsFonts.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.6 2001/12/19 21:55:59 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index 1c2877231..ea441cff5 100644 --- a/Xprint/ps/PsGC.c +++ b/Xprint/ps/PsGC.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.6tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index 193fc0518..a7a63343d 100644 --- a/Xprint/ps/PsInit.c +++ b/Xprint/ps/PsInit.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.13tsi Exp $ */ #include #include diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c index ff4c6da80..dd01fcb65 100644 --- a/Xprint/ps/PsLine.c +++ b/Xprint/ps/PsLine.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index 75f692d56..3085888c7 100644 --- a/Xprint/ps/PsMisc.c +++ b/Xprint/ps/PsMisc.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Xos.h" /* for SIGCLD on pre-POSIX systems */ #include diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c index 09a89fa2d..303b0d5ec 100644 --- a/Xprint/ps/PsPixel.c +++ b/Xprint/ps/PsPixel.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index 2e821aa1c..a020aba22 100644 --- a/Xprint/ps/PsPixmap.c +++ b/Xprint/ps/PsPixmap.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c index 0cd826f43..d334c7778 100644 --- a/Xprint/ps/PsPolygon.c +++ b/Xprint/ps/PsPolygon.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.6 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index 8a06205e5..5e549836f 100644 --- a/Xprint/ps/PsPrint.c +++ b/Xprint/ps/PsPrint.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.10 2001/12/14 19:59:17 dawes Exp $ */ #include #include diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c index 32ca58d20..a7370866e 100644 --- a/Xprint/ps/PsSpans.c +++ b/Xprint/ps/PsSpans.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c index b04d910d5..ae44b3f1c 100644 --- a/Xprint/ps/PsText.c +++ b/Xprint/ps/PsText.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.12tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c index e39b602cb..987d434ff 100644 --- a/Xprint/ps/PsWindow.c +++ b/Xprint/ps/PsWindow.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.12tsi Exp $ */ #include #include diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index f1507d849..6b4c71a2b 100644 --- a/Xprint/ps/psout.c +++ b/Xprint/ps/psout.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.11 2001/12/19 21:55:59 dawes Exp $ */ /* * For XFree86 3.3.3: diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h index 2fe83ffc7..37b089ece 100644 --- a/Xprint/ps/psout.h +++ b/Xprint/ps/psout.h @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.4 2001/12/14 19:59:18 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index d306dea21..c8dfad1e3 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index 0533cd5b2..750dc0722 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 7cce3f22a..4527ba8db 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ #include #include "X.h" diff --git a/afb/afb.h b/afb/afb.h index 1f6401782..708fe7643 100644 --- a/afb/afb.h +++ b/afb/afb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index 7f04a7de0..b07216899 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbblt.c b/afb/afbblt.c index c0b48130e..13a56e521 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */ /* * afb copy area */ diff --git a/afb/afbbres.c b/afb/afbbres.c index 227f3bc1f..732ea65fa 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 57309175e..581ecb84f 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index 725f93d48..c3e844d57 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbclip.c b/afb/afbclip.c index 07eb3b816..0acf35b2a 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbcmap.c b/afb/afbcmap.c index e56558972..cfa41aab3 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */ /* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c index 1db48b07c..e13c7948a 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index 25ab5e56e..b5e6802d2 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index 69985aebc..647641d7d 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfont.c b/afb/afbfont.c index 0ad8d9de3..5df6691c5 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */ +/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbgc.c b/afb/afbgc.c index fe88475a3..4ce893902 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 0fa825d21..26ed5ba60 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index b50c357b4..7165afd51 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbimage.c b/afb/afbimage.c index cfb230e36..52553f55a 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 60d212ca0..8f7509df5 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbline.c b/afb/afbline.c index 796ddffeb..221e2ddd7 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index c0ae1c545..4928a84d3 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index fe0d8bc79..951ec9946 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index c0c2065f1..3156b0617 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c index 3938433c3..26d87868a 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index 239346ceb..c552b388a 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index 17d924059..bb84e676a 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c index b09f3b037..23dca7416 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index d556acd8c..311becb8a 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index d2b3fd02b..d947825e2 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index 93331b857..a4ea4d3ac 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index b12eeb252..a4acf326f 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */ /* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtile.c b/afb/afbtile.c index 3b861b822..b4376d18c 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbwindow.c b/afb/afbwindow.c index 024fc04b6..b6037d8cb 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */ /* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c index db1bd2bfd..ae9136f70 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/cfb/cfb.h b/cfb/cfb.h index b7d027905..e5900dc15 100644 --- a/cfb/cfb.h +++ b/cfb/cfb.h @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */ #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 1dd742c60..3309fb764 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.4 2001/01/17 22:36:34 dawes Exp $ */ /* * cfb8bit.c diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h index 0c6b51925..2bfdace35 100644 --- a/cfb/cfb8bit.h +++ b/cfb/cfb8bit.h @@ -7,7 +7,7 @@ * are used for depths other than 8. Perhaps the file should be * renamed. dpw */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.7 2001/12/14 19:59:20 dawes Exp $ */ /* diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 01c412b97..6f8f896b8 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.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/cfb/cfb8line.c,v 3.19 2003/10/29 22:44:52 tsi Exp $ + * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.18tsi Exp $ * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 6c2fa30f3..8b2468992 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.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/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index 18f90f1fd..b8ef23301 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -2,7 +2,7 @@ * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.19tsi Exp $ */ /* diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 5d2e084fd..7f4e3e10f 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -1,7 +1,7 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.13tsi Exp $ */ /* diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index 452259581..b306ee80b 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 7fe71fa2f..4f6630ab3 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 5e7b91471..19de06ad9 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */ /*- * cfbbstore.c -- * Functions required by the backing-store implementation in MI. diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1830ffa5e..1806916ff 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ #include "X.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index ee4c18fdc..a2a51a452 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.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/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 64ec508c8..01e4557d4 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.6tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index c6a7270c2..86258ed4f 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -1,7 +1,7 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ /* diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 14a6a9d52..6234694d6 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index c2e7a5965..b4a9cc484 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 737f30237..003be6dcc 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index 60a012c28..c0fb01c0e 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall 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/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.7 2003/07/16 01:38:37 dawes Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 6f4f7abe6..88b1e740f 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index aa1060240..a40e995be 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 1983ae48a..68b5cc68d 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 432cb62d9..28b0cb8c5 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 42056345a..60fa94df2 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.11tsi Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index cbf364770..5bc759d01 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index b7f9969dd..5d5764c09 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.13tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index bd2e1b6f1..3502e879c 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index 0b14bc614..fa38f0cf4 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.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/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index c77d01961..88d8e0f07 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.4.2.2 2004/03/04 17:47:25 eich Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -45,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index d8b781397..a5886b6ec 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 0de172f03..3f313b0e3 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -2,7 +2,7 @@ * Push Pixels for 8 bit displays. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.5 2001/01/17 22:36:36 dawes Exp $ */ /* diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index 7f6e93919..ba8dd89f2 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -1,7 +1,7 @@ /* * Fill 32 bit stippled rectangles for 8 bit frame buffers */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 1ee6771e0..3014b3a5a 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.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/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* cfb reduced rasterop computations */ diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index d8dce082c..a43bf1978 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.11 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ #ifndef GXcopy #include "X.h" diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 7e0d15dd4..ffdf55b81 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.19 2001/01/17 22:36:36 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 4f7dfaee1..8385fe35a 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index f0a3e361e..f4e7f3385 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.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/cfb/cfbsolid.c,v 3.9 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index 5c4f1c445..c27f69312 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86$ */ #ifndef _CFBTAB_H_ #define _CFBTAB_H_ diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 0cdbddc7a..9048ec375 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -3,7 +3,7 @@ * 8 bit displays, in Copy mode with no clipping. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index 7450c7829..ff7f3be57 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index b202943e8..1ba4bb16d 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -2,7 +2,7 @@ * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.6tsi Exp $ */ /* diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index e372fe87d..bd6a0b82c 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -2,7 +2,7 @@ * Fill odd tiled rectangles and spans. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.6tsi Exp $ */ /* diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index cae13cf3c..13148728c 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index 3703a5105..baa89f318 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.4tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h index 9a2bac720..01bb939e8 100644 --- a/cfb/stip68kgnu.h +++ b/cfb/stip68kgnu.h @@ -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/cfb/stip68kgnu.h,v 3.4 2001/12/14 19:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.3 2001/01/17 22:36:37 dawes Exp $ */ /* * Stipple stack macro for 68k GCC diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s index 185795605..a6a40491f 100644 --- a/cfb/stipsparc.s +++ b/cfb/stipsparc.s @@ -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/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s index f878fbf80..5703c0f1b 100644 --- a/cfb/stipsprc32.s +++ b/cfb/stipsprc32.s @@ -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/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb24/cfbrrop24.h b/cfb24/cfbrrop24.h index 0bb97ce5b..9f15d1a82 100644 --- a/cfb24/cfbrrop24.h +++ b/cfb24/cfbrrop24.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.2 2003/10/29 22:46:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.1tsi Exp $ */ #define RROP_DECLARE \ unsigned long piQxelAnd[3], piQxelXor[3], spiQxelXor[8]; diff --git a/dbe/dbe.c b/dbe/dbe.c index 6b92baac7..aa3dad193 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.3.2.2 2004/03/04 17:47:26 eich Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * @@ -30,7 +31,7 @@ * DIX DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.10 2001/08/23 14:19:24 alanh Exp $ */ /* INCLUDES */ diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 3634fe7d7..f176c6fd1 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -30,7 +30,7 @@ * Header file for DIX-related DBE * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index e7617e728..bdf46b8ae 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -30,7 +30,7 @@ * Machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.4 2001/03/06 17:31:34 dawes Exp $ */ /* INCLUDES */ diff --git a/dbe/midbe.h b/dbe/midbe.h index 7b1237633..3f9bb0090 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -30,7 +30,7 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef MIDBE_H diff --git a/dix/atom.c b/dix/atom.c index 66c045583..7509f0a24 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/colormap.c b/dix/colormap.c index af959ed86..306ff941f 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.4.2.3 2004/03/04 20:16:04 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/cursor.c b/dix/cursor.c index 2ef9e5e24..fc81a5197 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/devices.c b/dix/devices.c index 46af5eabc..d4e4be823 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.21 2003/11/17 22:20:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.20 2001/12/14 19:59:30 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/dispatch.c b/dix/dispatch.c index 1d496ba04..e6602969a 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4.2.3 2004/03/08 00:36:56 alanc Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -47,28 +48,35 @@ SOFTWARE. ********************************************************/ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */ +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/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */ #ifdef PANORAMIX_DEBUG #include diff --git a/dix/dispatch.h b/dix/dispatch.h index d144c6c70..ba43bdca2 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.3 2002/02/19 11:09:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/dix/dixfonts.c b/dix/dixfonts.c index d971260c7..98f734f64 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.4.2.4 2004/03/08 00:36:56 alanc Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,6 +22,34 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ +/* The panoramix components contained the following notice */ +/***************************************************************** + +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. + +******************************************************************/ /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ diff --git a/dix/dixutils.c b/dix/dixutils.c index 38cfd4e0d..40f80d348 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.13 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/events.c b/dix/events.c index 2131b5fd4..11cdca280 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.50 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -47,26 +47,33 @@ SOFTWARE. ********************************************************/ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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. * -* * -*****************************************************************/ +/***************************************************************** + +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. + +******************************************************************/ /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ @@ -944,7 +951,8 @@ EnqueueEvent(xE, device, count) #ifdef XKB /* Fix for key repeating bug. */ - if (xE->u.u.type == KeyRelease) + if (device->key != NULL && device->key->xkbInfo != NULL && + xE->u.u.type == KeyRelease) AccessXCancelRepeatKey(device->key->xkbInfo, xE->u.u.detail); #endif @@ -1647,8 +1655,11 @@ DeliverEventsToWindow(pWin, pEvents, count, filter, grab, mskidx) #ifdef XINPUT else { - if (((type == DeviceMotionNotify) || (type == DeviceButtonPress)) && - deliveries) + if (((type == DeviceMotionNotify) +#ifdef XKB + || (type == DeviceButtonPress) +#endif + ) && deliveries) CheckDeviceGrabAndHintWindow (pWin, type, (deviceKeyButtonPointer*) pEvents, grab, client, deliveryMask); @@ -2367,10 +2378,10 @@ CheckPassiveGrabsOnWindow( xkbi= gdev->key->xkbInfo; #endif tempGrab.modifierDevice = grab->modifierDevice; - if (device == grab->modifierDevice && - (xE->u.u.type == KeyPress -#ifdef XINPUT - || xE->u.u.type == DeviceKeyPress + if ((device == grab->modifierDevice) && + ((xE->u.u.type == KeyPress) +#if defined(XINPUT) && defined(XKB) + || (xE->u.u.type == DeviceKeyPress) #endif )) tempGrab.modifiersDetail.exact = @@ -2455,11 +2466,11 @@ CheckDeviceGrabs(device, xE, checkFirst, count) register WindowPtr pWin = NULL; register FocusClassPtr focus = device->focus; - if ((xE->u.u.type == ButtonPress -#ifdef XINPUT - || xE->u.u.type == DeviceButtonPress + if (((xE->u.u.type == ButtonPress) +#if defined(XINPUT) && defined(XKB) + || (xE->u.u.type == DeviceButtonPress) #endif - ) && device->button->buttonsDown != 1) + ) && (device->button->buttonsDown != 1)) return FALSE; i = checkFirst; diff --git a/dix/extension.c b/dix/extension.c index 36f053f02..3fcf31b8e 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/gc.c b/dix/gc.c index 11f215c8d..ee787bca3 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.10 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.9 2001/12/14 19:59:32 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/globals.c b/dix/globals.c index 1ec71aac1..0ffedc828 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12 2003/11/10 18:21:46 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.1.4.3.4.2 2004/03/04 20:16:04 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -147,5 +148,3 @@ int argcGlobal; char **argvGlobal; DDXPointRec dixScreenOrigins[MAXSCREENS]; - -volatile ScreenPtr currentRegionScreen; diff --git a/dix/grabs.c b/dix/grabs.c index 7a9fbcdb5..6eba43d1f 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ #include "X.h" #include "misc.h" diff --git a/dix/main.c b/dix/main.c index 37add2a62..ed6b6f6e1 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5.2.4 2004/03/08 00:36:56 alanc Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -48,26 +49,33 @@ SOFTWARE. /* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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. * -* * -*****************************************************************/ +/***************************************************************** + +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. + +******************************************************************/ /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */ diff --git a/dix/pixmap.c b/dix/pixmap.c index fda07801c..2df5d7374 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5 2001/12/14 19:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/privates.c b/dix/privates.c index 2d0885846..64d705e24 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.8 2001/12/14 19:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/property.c b/dix/property.c index 1af6156b5..f3d0edc9e 100644 --- a/dix/property.c +++ b/dix/property.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.13 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/resource.c b/dix/resource.c index d885c03ef..7984f01ac 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -44,10 +44,37 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* The panoramix components contained the following notice */ +/***************************************************************** + +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. + +******************************************************************/ /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ - - +/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.1.4.4.2.3 2004/03/08 00:36:56 alanc Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -72,7 +99,7 @@ SOFTWARE. * 1, and an otherwise arbitrary ID in the low 22 bits, we can create a * resource "owned" by the client. */ -/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 494471730..6bde83b96 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.8 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.7 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/swapreq.c b/dix/swapreq.c index 358ec8139..d795a3dea 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.4 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/tables.c b/dix/tables.c index a76bc7535..6037b1220 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.6 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/window.c b/dix/window.c index 0ed9cb083..36289db5b 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.1.4.4.2.3 2004/03/08 00:36:56 alanc Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -49,28 +50,35 @@ SOFTWARE. */ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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/dix/window.c,v 3.37 2003/11/17 22:20:35 dawes Exp $ */ +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/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ #include "misc.h" #include "scrnintstr.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index a48a81402..dac3205fb 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */ +/* $XFree86$ */ /* Copyright 1996, 1998 The Open Group @@ -31,24 +31,24 @@ from The Open Group. #include "font.h" Bool -XpClientIsBitmapClient(client) - ClientPtr client; +XpClientIsBitmapClient( + ClientPtr client) { return TRUE; } Bool -XpClientIsPrintClient(client, fpe) - ClientPtr client; - FontPathElementPtr fpe; +XpClientIsPrintClient( + ClientPtr client, + FontPathElementPtr fpe) { return FALSE; } int -XprintOptions(argc, argv, i) - int argc; - char **argv; - int i; +XprintOptions( + int argc, + char **argv, + int i) { return i; } diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index 972280ba0..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.29 2003/09/08 14:25:26 eich 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__ @@ -37,16 +37,17 @@ is the generic name for the X Window System display server. It is frequently a link or a copy of the appropriate server binary for driving the most frequently used server on a given machine. .SH "STARTING THE SERVER" -The X server is usually started from the X Display Manager program \fIxdm\fP(1). +The X server is usually started from the X Display Manager program +\fIxdm\fP(1) or a similar display manager program. This utility is run from the system boot files and takes care of keeping the server running, prompting for usernames and passwords, and starting up the user sessions. .PP Installations that run more than one window system may need to use the -\fIxinit\fP(1) utility instead of \fIxdm\fP. However, \fIxinit\fP is +\fIxinit\fP(1) utility instead of a display manager. However, \fIxinit\fP is to be considered a tool for building startup scripts and is not intended for use by end users. Site administrators are \fBstrongly\fP -urged to use \fIxdm\fP, or build other interfaces for novice users. +urged to use a display manager, or build other interfaces for novice users. .PP The X server may also be started directly by the user, though this method is usually reserved for testing and is not recommended for @@ -95,8 +96,8 @@ Audit lines are sent as standard error output. .TP 8 .B \-auth \fIauthorization-file\fP specifies a file which contains a collection of authorization records used -to authenticate access. See also the \fIxdm\fP and \fIXsecurity\fP manual -pages. +to authenticate access. See also the \fIxdm\fP(1) and +\fIXsecurity\fP(__miscmansuffix__) manual pages. .TP 8 .B bc disables certain kinds of error checking, for bug compatibility with @@ -139,15 +140,23 @@ different from the user's real uid. .B \-core causes the server to generate a core dump on fatal errors. .TP 8 +.B \-deferglyphs \fIwhichfonts\fP +specifies the types of fonts for which the server should attempt to use +deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), +none (no fonts), or 16 (16 bit fonts only). +.TP 8 .B \-dpi \fIresolution\fP sets the resolution for all screens, in dots per inch. To be used when the server cannot determine the screen size(s) from the hardware. .TP 8 -.B \-deferglyphs \fIwhichfonts\fP -specifies the types of fonts for which the server should attempt to use -deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), -none (no fonts), or 16 (16 bit fonts only). +.B dpms +enables DPMS (display power management services), where supported. The +default state is platform and configuration specific. +.TP 8 +.B \-dpms +disables DPMS (display power management services). The default state +is platform and configuration specific. .TP 8 .B \-f \fIvolume\fP sets feep (bell) volume (allowable range: 0-100). @@ -161,6 +170,8 @@ sets the default font. .B \-fp \fIfontPath\fP sets the search path for fonts. This path is a comma separated list of directories which the X server searches for font databases. +See the FONTS section of this manual page for more information and the default +list. .TP 8 .B \-help prints a usage message. @@ -168,6 +179,11 @@ prints a usage message. .B \-I causes all remaining command line arguments to be ignored. .TP 8 +.B \-maxbigreqsize \fIsize\fP +sets the maxmium big request to +.I size +MB. +.TP 8 .B \-nolisten \fItrans-type\fP disables a transport type. For example, TCP/IP connections can be disabled with @@ -187,7 +203,11 @@ sets screen-saver pattern cycle time in minutes. .B \-pn permits the server to continue running if it fails to establish all of its well-known sockets (connection points for clients), but -establishes at least one. +establishes at least one. This option is set by default. +.TP 8 +.B \-nopn +causes the server to exit if it fails to establish all of its well-known +sockets (connection points for clients). .TP 8 .B \-r turns off auto-repeat. @@ -243,7 +263,7 @@ This is a no-op for most implementations. .TP 8 .B [+-]xinerama enables(+) or disables(-) the XINERAMA extension. The default state is -disabled. +platform and configuration specific. .SH SERVER DEPENDENT OPTIONS Some X servers accept the following options: .TP 8 @@ -288,6 +308,14 @@ use a gray map of 13 color cells for the X render extension. .I color use a color cube of at most 4*4*4 colors (that is 64 color cells). .RE +.TP 8 +.B \-dumbSched +disables smart scheduling on platforms that support the smart scheduler. +.TP +.B \-schedInterval \fIinterval\fP +sets the smart scheduler's scheduling interval to +.I interval +milliseconds. .SH XDMCP OPTIONS X servers that support XDMCP have the following options. See the \fIX Display Manager Control Protocol\fP specification for more @@ -300,6 +328,7 @@ enables XDMCP and sends Query packets to the specified .B \-broadcast enable XDMCP and broadcasts BroadcastQuery packets to the network. The first responding display manager will be chosen for the session. +.TP 8 .B \-multicast [\fIaddress\fP [\fIhop count\fP]] Enable XDMCP and multicast BroadcastQuery packets to the network. The first responding display manager is chosen for the session. If an @@ -316,8 +345,8 @@ enables XDMCP and send IndirectQuery packets to the specified .TP 8 .B \-port \fIport-number\fP uses the specified \fIport-number\fP for XDMCP packets, instead of the -default. This option must be specified before any \-query, \-broadcast or -\-indirect options. +default. This option must be specified before any \-query, \-broadcast, +\-multicast, or \-indirect options. .TP 8 .B \-from \fIlocal-address\fP specifies the local address to connect from (useful if the connecting host @@ -344,7 +373,10 @@ Yet another XDMCP specific value, this one allows the display manager to identify each display so that it can locate the shared key. .SH XKEYBOARD OPTIONS X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the -following options: +following options. All layout files specified on the command line must be +located in the XKB base directory or a subdirectory, and specified as the +relative path from the XKB base directory. The default XKB base directory is +.IR __projectroot__/lib/X11/xkb . .TP 8 .B [+-]kb enables(+) or disables(-) the XKEYBOARD extension. @@ -599,13 +631,14 @@ property Woo-Hoo OhBoy = "*son" ad The X server supports client connections via a platform-dependent subset of the following transport types: TCP\/IP, Unix Domain sockets, DECnet, and several varieties of SVR4 local connections. See the DISPLAY -NAMES section of the \fIX(__miscmansuffix__)\fP manual page to learn how to +NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to specify which transport type clients should try to use. .SH GRANTING ACCESS The X server implements a platform-dependent subset of the following authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1, -SUN-DES-1, and MIT-KERBEROS-5. See the \fIXsecurity\fP(__miscmansuffix__) -manual page for information on the operation of these protocols. +XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5. See the +\fIXsecurity\fP(__miscmansuffix__) manual page for information on the +operation of these protocols. .PP Authorization data required by the above protocols is passed to the server in a private file named with the \fB\-auth\fP command line @@ -626,15 +659,17 @@ this list initially consists of the host on which the server is running as well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where \fBn\fP is the display number of the server. Each line of the file should contain either an Internet hostname (e.g. expo.lcs.mit.edu) or a DECnet -hostname in double colon format (e.g. hydra::). There should be no leading -or trailing spaces on any lines. For example: +hostname in double colon format (e.g. hydra::) or a complete name in the format +\fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page. +There should be no leading or trailing spaces on any lines. For example: .sp .in +8 .nf joesworkstation corporate.company.com star:: -bigcpu:: +inet:bigcpu +local: .fi .in -8 .PP @@ -691,11 +726,7 @@ the X server uses when trying to open a font is controlled by the \fIfont path\fP. .LP The default font path is -__projectroot__/lib/X11/fonts/misc/, -__projectroot__/lib/X11/fonts/Speedo/, -__projectroot__/lib/X11/fonts/Type1/, -__projectroot__/lib/X11/fonts/75dpi/, -__projectroot__/lib/X11/fonts/100dpi/" . +__default_font_path__ . .LP The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1) after the server has started. @@ -707,7 +738,7 @@ Initial access control list for display number \fBn\fP .IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi Bitmap font directories .TP 30 -.IR __projectroot__/lib/X11/fonts/Speedo , __projectroot__/lib/X11/fonts/Type1 +.IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Speedo , __projectroot__/lib/X11/fonts/Type1 Outline font directories .TP 30 .I __projectroot__/lib/X11/rgb.txt @@ -720,7 +751,7 @@ Unix domain socket for display number \fBn\fP Kerberos 5 replay cache for display number \fBn\fP .TP 30 .I /usr/adm/X\fBn\fPmsgs -Error log file for display number \fBn\fP if run from \fIinit\fP(8) +Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__) .TP 30 .I __projectroot__/lib/X11/xdm/xdm-errors Default error log file if the server is run from \fIxdm\fP(1) @@ -732,15 +763,15 @@ Protocols: .I "The X Font Service Protocol," .I "X Display Manager Control Protocol" .PP -Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fIxfs\fP(1), -\fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1), +Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1), +\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1), .I "X Logical Font Description Conventions" .PP Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1), -\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1) +\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), .I "Security Extension Specification" .PP -Starting the server: \fIxdm(1)\fP, \fIxinit\fP(1) +Starting the server: \fIxdm\fP(1), \fIxinit\fP(1) .PP Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1), \fIxhost\fP(1) diff --git a/doc/smartsched b/doc/smartsched index 3d5a84b9b..057a759fd 100644 --- a/doc/smartsched +++ b/doc/smartsched @@ -201,4 +201,4 @@ response and benchmark numbers at the same time. -$XFree86: xc/programs/Xserver/hw/xfree86/doc/smartsched,v 1.2 1999/11/19 14:59:16 hohndel Exp $ +$XFree86: $ diff --git a/fb/fb.h b/fb/fb.h index 043061f53..9eb27eab2 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $ * * Copyright © 1998 Keith Packard * @@ -105,7 +105,7 @@ typedef unsigned __int64 FbBits; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(AMD64) || defined (__AMD64__) || \ + defined(amd64) || defined (__amd64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) typedef unsigned long FbBits; # else diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 1f9e843cf..08d681798 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.5 2001/05/29 04:54:08 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.4 2000/08/09 17:50:51 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fb24_32.h b/fb/fb24_32.h index d0a0acb97..80034aa25 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $ + * $XFree86$ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 687de493a..e7fcfd45b 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbarc.c b/fb/fbarc.c index 9713ffb09..bba95a84e 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.8 2002/11/09 04:59:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */ #include "fb.h" #include "mizerarc.h" diff --git a/fb/fbbits.c b/fb/fbbits.c index b1c123d21..3cca2bbb2 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.6 2000/02/23 20:29:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbbits.h b/fb/fbbits.h index 80fbc4010..4f9d04e62 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbblt.c b/fb/fbblt.c index b1fd5f5b0..c6e29f387 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbltone.c b/fb/fbbltone.c index e758794b8..762022551 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.13 2002/02/23 00:42:07 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbstore.c b/fb/fbbstore.c index 07a6400a8..7b0863856 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.2 2000/02/23 20:29:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbcmap.c b/fb/fbcmap.c index aeb53b1fb..001277a1d 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -1,5 +1,5 @@ /* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/fb/fbcompose.c b/fb/fbcompose.c index dd030d927..e374de692 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,6 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $ + * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.1.4.2.4.2 2004/03/04 20:16:09 kaleb Exp $ + * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -2424,6 +2425,8 @@ fbStore_external (FbCompositeOperand *op, CARD32 value) (*op[2].store) (&op[2], value & 0xff000000); } +#define dummyScreen screenInfo.screens[0] + CARD32 fbFetch_transform (FbCompositeOperand *op) { @@ -2445,7 +2448,7 @@ fbFetch_transform (FbCompositeOperand *op) case PictFilterNearest: y = xFixedToInt (v.vector[1]) + op->u.transform.top_y; x = xFixedToInt (v.vector[0]) + op->u.transform.left_x; - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetch) (&op[1]); @@ -2469,7 +2472,7 @@ fbFetch_transform (FbCompositeOperand *op) xerr = xFixed1 - xFixedFrac (v.vector[0]); for (x = minx; x <= maxx; x++) { - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetch) (&op[1]); @@ -2527,7 +2530,7 @@ fbFetcha_transform (FbCompositeOperand *op) case PictFilterNearest: y = xFixedToInt (v.vector[1]) + op->u.transform.left_x; x = xFixedToInt (v.vector[0]) + op->u.transform.top_y; - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetcha) (&op[1]); @@ -2551,7 +2554,7 @@ fbFetcha_transform (FbCompositeOperand *op) xerr = xFixed1 - xFixedFrac (v.vector[0]); for (x = minx; x <= maxx; x++) { - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetcha) (&op[1]); diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 74d07a1bf..2f2d2f12b 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -398,7 +398,10 @@ fbDoCopy (DrawablePtr pSrcDrawable, int dx; int dy; int numRects; - BoxRec box; + int box_x1; + int box_y1; + int box_x2; + int box_y2; Bool fastSrc = FALSE; /* for fast clipping with pixmap source */ Bool fastDst = FALSE; /* for fast clipping with one rect dest */ Bool fastExpose = FALSE; /* for fast exposures with pixmap source */ @@ -466,10 +469,10 @@ fbDoCopy (DrawablePtr pSrcDrawable, xOut += pDstDrawable->x; yOut += pDstDrawable->y; - box.x1 = xIn; - box.y1 = yIn; - box.x2 = xIn + widthSrc; - box.y2 = yIn + heightSrc; + box_x1 = xIn; + box_y1 = yIn; + box_x2 = xIn + widthSrc; + box_y2 = yIn + heightSrc; dx = xIn - xOut; dy = yIn - yOut; @@ -484,32 +487,32 @@ fbDoCopy (DrawablePtr pSrcDrawable, * clip the source; if regions extend beyond the source size, * make sure exposure events get sent */ - if (box.x1 < pSrcDrawable->x) + if (box_x1 < pSrcDrawable->x) { - box.x1 = pSrcDrawable->x; + box_x1 = pSrcDrawable->x; fastExpose = FALSE; } - if (box.y1 < pSrcDrawable->y) + if (box_y1 < pSrcDrawable->y) { - box.y1 = pSrcDrawable->y; + box_y1 = pSrcDrawable->y; fastExpose = FALSE; } - if (box.x2 > pSrcDrawable->x + (int) pSrcDrawable->width) + if (box_x2 > pSrcDrawable->x + (int) pSrcDrawable->width) { - box.x2 = pSrcDrawable->x + (int) pSrcDrawable->width; + box_x2 = pSrcDrawable->x + (int) pSrcDrawable->width; fastExpose = FALSE; } - if (box.y2 > pSrcDrawable->y + (int) pSrcDrawable->height) + if (box_y2 > pSrcDrawable->y + (int) pSrcDrawable->height) { - box.y2 = pSrcDrawable->y + (int) pSrcDrawable->height; + box_y2 = pSrcDrawable->y + (int) pSrcDrawable->height; fastExpose = FALSE; } /* Translate and clip the dst to the destination composite clip */ - box.x1 -= dx; - box.x2 -= dx; - box.y1 -= dy; - box.y2 -= dy; + box_x1 -= dx; + box_x2 -= dx; + box_y1 -= dy; + box_y2 -= dy; /* If the destination composite clip is one rectangle we can do the clip directly. Otherwise we have to create a full @@ -520,21 +523,26 @@ fbDoCopy (DrawablePtr pSrcDrawable, { BoxPtr pBox = REGION_RECTS(cclip); - if (box.x1 < pBox->x1) box.x1 = pBox->x1; - if (box.x2 > pBox->x2) box.x2 = pBox->x2; - if (box.y1 < pBox->y1) box.y1 = pBox->y1; - if (box.y2 > pBox->y2) box.y2 = pBox->y2; + if (box_x1 < pBox->x1) box_x1 = pBox->x1; + if (box_x2 > pBox->x2) box_x2 = pBox->x2; + if (box_y1 < pBox->y1) box_y1 = pBox->y1; + if (box_y2 > pBox->y2) box_y2 = pBox->y2; fastDst = TRUE; } } /* Check to see if the region is empty */ - if (box.x1 >= box.x2 || box.y1 >= box.y2) + if (box_x1 >= box_x2 || box_y1 >= box_y2) { REGION_NULL(pGC->pScreen, &rgnDst); } else { + BoxRec box; + box.x1 = box_x1; + box.y1 = box_y1; + box.x2 = box_x2; + box.y2 = box_y2; REGION_INIT(pGC->pScreen, &rgnDst, &box, 1); } diff --git a/fb/fbfill.c b/fb/fbfill.c index 8ecb3cde6..d03bc6461 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */ #include "fb.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index d0468e041..c39b500fd 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index 29c3a36b0..dae05b0ed 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbgc.c b/fb/fbgc.c index 28c58a673..a3d1b0bc6 100644 --- a/fb/fbgc.c +++ b/fb/fbgc.c @@ -21,7 +21,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.12 2001/05/29 04:54:09 keithp Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.1.4.1.4.2 2004/03/04 20:16:09 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #include "fb.h" #ifdef IN_MODULE @@ -253,17 +254,19 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) } if (changes & GCStipple) { - if (pGC->stipple && - (FbEvenStip (pGC->stipple->drawable.width, - pDrawable->bitsPerPixel) || - fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel))) - { - pPriv->evenStipple = TRUE; + pPriv->evenStipple = FALSE; + + if (pGC->stipple) { + + /* can we do an even stipple ?? */ + if (FbEvenStip (pGC->stipple->drawable.width, + pDrawable->bitsPerPixel) && + (fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel))) + pPriv->evenStipple = TRUE; + if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT) fbPadPixmap (pGC->stipple); } - else - pPriv->evenStipple = FALSE; } /* * Recompute reduced rop values diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index db35f6d5c..3140377e5 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.6 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbglyph.c b/fb/fbglyph.c index f8f2179d5..1e13f76d1 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -1,5 +1,6 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ + * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.1.4.1.4.2 2004/03/04 20:16:09 kaleb Exp $ + * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $ * * Copyright © 1998 Keith Packard * @@ -25,6 +26,8 @@ #include "fb.h" #include "fontstruct.h" #include "dixfontstr.h" + +#define dummyScreen screenInfo.screens[0] Bool fbGlyphIn (RegionPtr pRegion, @@ -34,7 +37,7 @@ fbGlyphIn (RegionPtr pRegion, int height) { BoxRec box; - BoxPtr pExtents = REGION_EXTENTS (0, pRegion); + BoxPtr pExtents = REGION_EXTENTS (dummyScreen, pRegion); /* * Check extents by hand to avoid 16 bit overflows @@ -51,7 +54,7 @@ fbGlyphIn (RegionPtr pRegion, box.x2 = x + width; box.y1 = y; box.y2 = y + height; - return RECT_IN_REGION (0, pRegion, &box) == rgnIN; + return RECT_IN_REGION (dummyScreen, pRegion, &box) == rgnIN; } #ifdef FB_24BIT diff --git a/fb/fbimage.c b/fb/fbimage.c index 7d0284c38..49356f627 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" #ifdef XFree86LOADER diff --git a/fb/fbline.c b/fb/fbline.c index 957222492..d48780100 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 00521eef2..28068db83 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.6tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fboverlay.h b/fb/fboverlay.h index 3dca8a3a4..72891ece3 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.5 2002/09/19 13:22:00 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.c b/fb/fbpict.c index 894d5cd62..533f08d01 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.h b/fb/fbpict.h index fd911b078..9ecc7a909 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.11 2002/09/26 02:56:48 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 757406c21..e47999dbb 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.11 2002/09/16 18:05:34 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 20426a9f1..255cfa05c 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbpush.c b/fb/fbpush.c index 4ae60764c..ffb357ca3 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbrop.h b/fb/fbrop.h index 9481be680..0b97be66f 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.4 2000/02/23 20:29:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index bdcc9d139..2a46b00be 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.11 2000/09/03 05:09:47 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbseg.c b/fb/fbseg.c index 284f11fa9..993672b2c 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index e207760c6..ea9f3b581 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbsolid.c b/fb/fbsolid.c index 17b5bffe0..a325da0c2 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 88f694bb8..46278c1ac 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.7 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbtile.c b/fb/fbtile.c index ed447f8d3..27cd42372 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 3a44d53ef..8fcd2b5cc 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.10 2002/09/27 00:31:24 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.9 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 University of Southern California * diff --git a/fb/fbutil.c b/fb/fbutil.c index 54b88ad7e..436bff72c 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.5 2001/03/28 14:37:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 262716543..ebf35bba8 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.3.2.2 2004/03/04 17:47:28 eich Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -21,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man index a718e41ce..265dbeb63 100644 --- a/hw/darwin/XDarwin.man +++ b/hw/darwin/XDarwin.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.3 2001/09/23 23:02:37 torrey Exp $ .\" .TH XDARWIN 1 __vendorversion__ .SH NAME diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf index 3cd250116..56038582a 100644 --- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf +++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf @@ -1,124 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5160\viewh4480\viewkind0 +\vieww9000\viewh9000\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp index e7ca52c2c..adbfb2ac0 100644 --- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp @@ -1 +1 @@ - #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.

Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)

In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.

Meerknopsmuis emulatie

Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt geïnstalleerd.

Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.

Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.
  • X11 scherm nummer: Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van één groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.

Schermvullend

  • Toetscombinatie knop: Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.

Licentie

The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

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, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

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 THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, 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 the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.

X Window System is a trademark of X Consortium, Inc.

\ No newline at end of file + #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.

Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)

In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.

Meerknopsmuis emulatie

Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt geïnstalleerd.

Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.

Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.
  • X11 scherm nummer: Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van één groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.

Schermvullend

  • Toetscombinatie knop: Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.

Licentie

The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

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, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

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 THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, 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 the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.

X Window System is a trademark of X Consortium, Inc.

\ No newline at end of file diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf index 4e2fad42c..2bf7a8eaf 100644 --- a/hw/darwin/bundle/English.lproj/Credits.rtf +++ b/hw/darwin/bundle/English.lproj/Credits.rtf @@ -1,138 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} +\vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2.99.x: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp index 99211244e..4a8467ce1 100644 --- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp +++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp @@ -1,5 +1,5 @@ /* English versions of the Info.plist keys; used by most localizations. */ /* Most of these are set in the target application settings. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */ NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__; diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings index 241d1585b..2c25c1dc3 100644 --- a/hw/darwin/bundle/English.lproj/Localizable.strings +++ b/hw/darwin/bundle/English.lproj/Localizable.strings @@ -1,5 +1,5 @@ /* English localized versions of strings used by the Mac OS X front end. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.3 2002/01/30 06:50:46 torrey Exp $ */ /* Title of alert panel */ "Quit X server?" = "Quit X server?"; diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp index fc11e26d3..5f18216aa 100644 --- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf index 5e52d1177..82f12ac44 100644 --- a/hw/darwin/bundle/French.lproj/Credits.rtf +++ b/hw/darwin/bundle/French.lproj/Credits.rtf @@ -1,123 +1,156 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh4480\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Participants \'88 XonX pour XFree86 4.2 : -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc + +\f1\b \cf0 \ +Participants \'88 XonX pour XFree86 4.2 : +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Version pour Darwin x86 -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Traduction en espagnol -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Traduction en allemand -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Traduction en cor\'8een -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Claviers non-US -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Direction du projet -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Traduction en allemand -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Traduction en su\'8edois -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Version \'c7 rootless \'c8 -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Traduction en japonais -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i Traduction en fran\'8dais -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Remerciements : -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman et Zero G Software, Inc.\ \f2\i Installeur -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Participants \'88 XonX pour XFree86 4.2 : -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Version pour Darwin x86 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Direction du projet -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Version Cocoa de l'interface de XDarwin -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Impl\'8ementation initiale sur Quartz -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Librairies partag\'8ees dynamiquement -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Traduction en japonais -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Remerciements : -\f1\b0 \ +\f1\b \cf0 Remerciements : +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ Ic\'99ne \f2\i XDarwin -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Historique : -\f1\b0 \ +\f1\b \cf0 Historique : +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Premi\'8fre adaptation de XFree86 sur Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i Adaptation de Free86 4.0 pour Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Int\'8egration dans le projet XFree86 pour la version 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp index 0fdfb01fb..4b23c46cd 100644 --- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf index 3cd250116..2bf7a8eaf 100644 --- a/hw/darwin/bundle/German.lproj/Credits.rtf +++ b/hw/darwin/bundle/German.lproj/Credits.rtf @@ -1,124 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5160\viewh4480\viewkind0 +\vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp index 6b1b91f5c..f7b6e96ae 100644 --- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf index 6b1f82d8a..8278a4063 100644 --- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf +++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf @@ -1,135 +1,175 @@ -{\rtf1\mac\ansicpg10001\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; \f3\fnil\fcharset78 HiraKakuPro-W3;} {\colortbl;\red255\green255\blue255;} \vieww13980\viewh11160\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper +\f2\i \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f3\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3 +\f0 \ +Torrey T. Lyons\ + +\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 +\f0 \ +Michael Oland\ + +\f3 \'90\'56\'82\'b5\'82\'a2 +\f0 XDarwin +\f3 \'83\'41\'83\'43\'83\'52\'83\'93 +\f0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ Darwin x86 \f2\i \f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Pablo Di Noto\ \f2\i \f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Paul Edens\ \f2\i \f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Kyunghwan Kim\ \f2\i \f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Mario Klebsch\ \f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Torrey T. Lyons\ \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b -\f1 \ +\f0 \ Andreas Monitzer\ \f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Patrik Montgomery\ \f2\i \f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Greg Parker\ \f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ - -\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 -\f1 \ - -\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ -Olivier Verdier\ - -\f2\i -\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 +\f0 \ + +\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 +\f0 \ +Olivier Verdier\ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f2\i \cf0 +\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 +\f0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i \f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89 -\f1 \ +\f0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ Darwin x86 \f3 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Torrey T. Lyons\ \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b -\f1 \ +\f0 \ Andreas Monitzer\ Cocoa \f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68 -\f1 \ +\f0 \ Greg Parker\ \f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67 -\f1 \ +\f0 \ Christoph Pfisterer\ \f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a -\f1 \ +\f0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 -\f1 \ +\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 +\f0 \ \f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ XDarwin \f3 \'83\'41\'83\'43\'83\'52\'83\'93 -\f1 \ +\f0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41 -\f1 \ +\f0 \ Dave Zarzycki\ XFree86 4.0 \f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41 -\f1 \ +\f0 \ Torrey T. Lyons\ XFree86 4.0.2 \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87} \ No newline at end of file diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp index 2065d43d4..9585d7b3f 100644 --- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp @@ -1,149 +1,149 @@ - - -#include "xf86Version.h" -#ifndef PRE_RELEASE -#define PRE_RELEASE XF86_VERSION_SNAP -#endif - - - - - -XFree86 for Mac OS X - -
-

XFree86 on Darwin and Mac OS X

- XFree86 XF86_VERSION
- Release Date: XF86_REL_DATE -
-

Ìܼ¡

-
    -
  1. Ãí°Õ»ö¹à
    2. -
  2. »ÈÍÑË¡
    3. -
  3. ¥Ñ¥¹¤ÎÀßÄê
    4. -
  4. ´Ä¶­ÀßÄê
    5. -
  5. ¥é¥¤¥»¥ó¥¹
    6. -
-
-

Ãí°Õ»ö¹à

-
-
-#if PRE_RELEASE -¤³¤ì¤Ï¡¤XFree86 ¤Î¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Ç¤¢¤ê¡¤¤¤¤«¤Ê¤ë¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£ -¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ -¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Î¥Ð¥°¤òÊó¹ð¤¹¤ëÁ°¤Ë¡¤XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤Þ¤¿¤Ï XFree86 CVS ¥ê¥Ý¥¸¥È¥ê¤ÇºÇ¿·ÈǤΥÁ¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤¡£ -#else -¤â¤·¡¤¥µ¡¼¥Ð¡¼¤¬ 6 -12 ¥ö·î°Ê¾åÁ°¤Î¤â¤Î¤«¡¤¤Þ¤¿¤Ï¤¢¤Ê¤¿¤Î¥Ï¡¼¥É¥¦¥§¥¢¤¬¾åµ­¤ÎÆüÉÕ¤è¤ê¤â¿·¤·¤¤¤â¤Î¤Ê¤é¤Ð¡¤ÌäÂê¤òÊó¹ð¤¹¤ëÁ°¤Ë¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òõ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£ -¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ -#endif -
-
-ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¤MIT X11/X Consortium License ¤Î¾ò·ï¤Ë´ð¤Å¤­¡¤ÌµÊݾڤǡ¤¡Ö¤½¤Î¤Þ¤Þ¡×¤Î·Á¤Ç¶¡µë¤µ¤ì¤Þ¤¹¡£ -¤´»ÈÍѤˤʤëÁ°¤Ë¡¤¥é¥¤¥»¥ó¥¹¾ò·ï¤ò¤ªÆɤ߲¼¤µ¤¤¡£ -
- -

»ÈÍÑË¡

-

XFree86 ¤Ï¡¤XFree86 Project, Inc.¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿¡¤ºÆÇÛÉÛ²Äǽ¤Ê¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î X Window System ¤Î¼ÂÁõ¤Ç¤¹¡£ -XFree86 ¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë Darwin ¤È Mac OS X ¤Î¤¿¤á¤Î X Window ¥µ¡¼¥Ð¡¼¤ò XDarwin ¤È¸Æ¤Ó¤Þ¤¹¡£ -XDarwin ¤Ï¡¤Mac OS X ¾å¤Ç¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£

- -

¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤¬¥¢¥¯¥Æ¥£¥Ö¤Ê»þ¡¤¤½¤ì¤ÏÁ´²èÌ̤òÀêÍ­¤·¤Þ¤¹¡£ -¤¢¤Ê¤¿¤Ï¡¤Command-Option-A ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤ØÀÚ¤êÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥­¡¼¤ÎÁȤ߹ç¤ï¤»¤Ï¡¤´Ä¶­ÀßÄê¤ÇÊѹ¹²Äǽ¤Ç¤¹¡£ -Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤«¤é X Window System ¤ØÀÚ¤êÂؤ¨¤ë¾ì¹ç¤Ï¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£ -¡Ê´Ä¶­ÀßÄê¤Ç¡¤¥Õ¥í¡¼¥Æ¥£¥ó¥°¡¦¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤è¤¦¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë

- -

¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤È Aqua ¤Ï²èÌ̤ò¶¦Í­¤·¤Þ¤¹¡£ -X11 ¤¬É½¼¨¤¹¤ë¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï²èÌ̤Υµ¥¤¥º¤Ç¤¢¤ê¡¤Â¾¤ÎÁ´¤Æ¤Î¥¦¥£¥ó¥É¥¦¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£ -Aqua ¤¬¥Ç¥¹¥¯¥È¥Ã¥×¤ÎÇطʤòÀ©¸æ¤¹¤ë¤Î¤Ç¡¤X11 ¤Î¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£

- -

Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó

-

¿¤¯¤Î X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¤3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤òɬÍפȤ·¤Þ¤¹¡£ -¤¢¤Ê¤¿¤Ï¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ÈƱ»þ¤Ë¤¤¤¯¤Ä¤«¤Î½¤¾þ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ¡¤°ì¤Ä¤Î¥Ü¥¿¥ó¤Ç 3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤ò¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ -¤³¤ì¤Ï¡¤´Ä¶­ÀßÄê¤Î¡Ö°ìÈÌÀßÄê¡×¤Î¡ÖÊ£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¡×¥»¥¯¥·¥ç¥ó¤ÇÀßÄꤷ¤Þ¤¹¡£ -¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤ÏÍ­¸ú¤Ç¡¤¥³¥Þ¥ó¥É¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 2 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£ -¥ª¥×¥·¥ç¥ó¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 3 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£ -¤¢¤Ê¤¿¤Ï¡¤´Ä¶­ÀßÄê¤Ç¥Ü¥¿¥ó 2 ¤È 3 ¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë½¤¾þ¥­¡¼¤ÎÁȹ礻¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ -Ãí¡§½¤¾þ¥­¡¼¤ò xmodmap ¤Ç¾¤Î¥­¡¼¤Ë³ä¤êÅö¤Æ¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¤Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ç¤ÏËÜÍè¤Î¥³¥Þ¥ó¥É¥­¡¼¤ä¥ª¥×¥·¥ç¥ó¥­¡¼¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£

- -

¥Ñ¥¹¤ÎÀßÄê

-

¥Ñ¥¹¤Ï¡¤ ¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¹¡£ -X11 ¥Ð¥¤¥Ê¥ê¤Ï¡¤/usr/X11R6/bin ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤½¤ì¤ò¥Ñ¥¹¤Ë²Ã¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ -XDarwin ¤Ï¡¤¤³¤ì¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¹Ô¤¤¤Þ¤¹¡£¤Þ¤¿¡¤¤¢¤Ê¤¿¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ÄɲäΥǥ£¥ì¥¯¥È¥ê¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

- -

·Ð¸³Ë­¤«¤Ê¥æ¡¼¥¶¡¼¤Ï¡¤¤¹¤Ç¤Ë¼«¤é¤Î¥·¥§¥ë¤Î¤¿¤á¤Ë½é´ü²½¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¥Ñ¥¹¤òÀßÄꤷ¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£ -¤³¤Î¾ì¹ç¡¤¤¢¤Ê¤¿¤Ï´Ä¶­ÀßÄê¤Ç XDarwin ¤¬¤¢¤Ê¤¿¤Î¥Ñ¥¹¤òÊѹ¹¤·¤Ê¤¤¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ -XDarwin ¤Ï¡¤¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥í¥°¥¤¥ó¥·¥§¥ë¤ÇºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤ò³«»Ï¤·¤Þ¤¹¡£ -¡Ê´Ä¶­ÀßÄê¤ÇÂå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë -¥Ñ¥¹¤òÀßÄꤹ¤ëÊýË¡¤Ï¡¤¤¢¤Ê¤¿¤¬»ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë°Í¸¤·¤Þ¤¹¡£ -¤³¤ì¤Ï¡¤¥·¥§¥ë¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - -

¤Þ¤¿¡¤¤¢¤Ê¤¿¤Ï¥É¥­¥å¥á¥ó¥È¤òõ¤·¤Æ¤¤¤ë»þ¡¤XFree86 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸¡º÷¤µ¤ì¤ë¥Ú¡¼¥¸¤Î¥ê¥¹¥È¤ËÄɲä·¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£ -X11 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï /usr/X11R6/man ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤½¤·¤Æ MANPATH ´Ä¶­ÊÑ¿ô¤Ï¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£

- -

´Ä¶­ÀßÄê

-

¡ÖXDarwin¡×¥á¥Ë¥å¡¼¤Î¡Ö´Ä¶­ÀßÄê...¡×¥á¥Ë¥å¡¼¹àÌܤ«¤é¥¢¥¯¥»¥¹¤Ç¤­¤ë´Ä¶­ÀßÄê¥Ñ¥Í¥ë¤Ç¡¤¤¤¤¯¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ -¡Öµ¯Æ°¥ª¥×¥·¥ç¥ó¡×¤ÎÆâÍƤϡ¤XDarwin ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤È¤Ê¤ê¤Þ¤»¤ó¡£ -¾¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ÎÆâÍƤϡ¤Ä¾¤Á¤ËÍ­¸ú¤È¤Ê¤ê¤Þ¤¹¡£ -°Ê²¼¡¤¤½¤ì¤¾¤ì¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹:

- -

°ìÈÌÀßÄê

-
    -
  • X11 ¤Ç¥·¥¹¥Æ¥à¤Î¥Ó¡¼¥×²»¤ò»ÈÍѤ¹¤ë: ¥ª¥ó¤Î¾ì¹ç¡¤Mac OS X ¤Î¥Ó¡¼¥×²»¤¬ X11 ¤Î¥Ù¥ë¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥ª¥Õ¤Î¾ì¹ç¡Ê¥Ç¥Õ¥©¥ë¥È¡Ë¡¤¥·¥ó¥×¥ë ¥È¡¼¥ó¤¬»È¤ï¤ì¤Þ¤¹¡£
    • -
  • X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë: ɸ½àŪ¤Ê X Window System ¤Î¼ÂÁõ¤Ç¤Ï¡¤¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤Ï¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ - ¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤Ë Mac OS X ¤Î¥·¥¹¥Æ¥à´Ä¶­ÀßÄê¤È X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬°Û¤Ê¤ëÃͤòÀßÄꤷ¤¿¾ì¹ç¡¤¤³¤ì¤Ïº®Íð¤ò¾·¤­¤Þ¤¹¡£ - ¤³¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¡¤¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤È¤·¤Þ¤»¤ó¡£
    • -
  • Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó: »ÈÍÑË¡¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥ª¥ó¤Î¾ì¹ç¡¤¥Þ¥¦¥¹¥Ü¥¿¥ó¤¬Âè 2 ¤Þ¤¿¤ÏÂè 3 ¤Î¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë»þ¤Ë¡¤ÁªÂò¤·¤¿½¤¾þ¥­¡¼¤òƱ»þ¤Ë²¡¤·¤Þ¤¹¡£
    • -
- -

µ¯Æ°¥ª¥×¥·¥ç¥ó

-
    -
  • ²èÌ̥⡼¥É: ¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¤¤³¤³¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£
    • -
  • µ¯Æ°»þ¤Ë¥â¡¼¥ÉÁªÂò¥Ñ¥Í¥ë¤òɽ¼¨¤¹¤ë: ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤XDarwin ¤Îµ¯Æ°»þ¤Ë¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤òÁªÂò¤¹¤ë¥Ñ¥Í¥ë¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¥ª¥Õ¤Î¾ì¹ç¡¤²èÌ̥⡼¥É¤Ç»ØÄꤷ¤¿¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£
    • -
  • X11 ¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ: X11¤Ï¡¤°ì¤Ä¤Î¥³¥ó¥Ô¥å¡¼¥¿¾å¤ÇÊÌ¡¹¤Î X ¥µ¡¼¥Ð¡¼¤¬´ÉÍý¤¹¤ëÊ£¿ô¤Î¥Ç¥£¥¹¥×¥ì¥¤¤¬Â¸ºß¤¹¤ë¤³¤È¤òµö¤·¤Þ¤¹¡£Ê£¿ô¤Î X ¥µ¡¼¥Ð¡¼¤¬Æ±»þ¤Ë¼Â¹Ô¤·¤Æ¤¤¤ë»þ¡¤XDarwin ¤¬»ÈÍѤ¹¤ë¥Ç¥£¥¹¥×¥ì¥¤¤ÎÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • -
  • Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë: XDarwin ¤Ï¡¤Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤½¤ì¤ÏÁ´¤Æ¤Î¥â¥Ë¥¿¤ò°ì¤Ä¤ÎÂ礭¤Ê²èÌ̤ΰìÉô¤È¤ß¤Ê¤·¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç Xinerama ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¤¸½ºß XDarwin ¤Ï¤½¤ì̵¤·¤ÇÀµ¤·¤¯Ê£¿ô¤Î¥â¥Ë¥¿¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤â¤·¡¤¤¢¤Ê¤¿¤¬°ì¤Ä¤Î¥â¥Ë¥¿¤ò»È¤¦¤À¤±¤Ê¤é¤Ð¡¤Xinerama ¤Ï¼«Æ°Åª¤Ë̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£
    • -
  • ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë: ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ïµ¯Æ°»þ¤ËÆɤ߹þ¤Þ¤ì¡¤X11 ¥­¡¼¥Þ¥Ã¥×¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Â¾¸À¸ì¤ËÂбþ¤·¤¿¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ï /System/Library/Keyboards ¤Ë¤¢¤ê¤Þ¤¹¡£¡ÊÌõÃí¡§¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¤Ç Japanese ¤òÁªÂò¤¹¤ë¤È¡¤°ìÉô¤Î¥­¡¼¤¬¸ú¤«¤Ê¤¤Åù¤ÎÉÔ¶ñ¹ç¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï USA ¤òÁªÂò¤·¤¿¾å¤Ç ~/.Xmodmap ¤òŬÍѤ·¤Æ²¼¤µ¤¤¡£¡Ë
    • -
  • ºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°: XDarwin ¤¬ Finder¤«¤éµ¯Æ°¤¹¤ë»þ¡¤X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤È X ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°¤Ï xinit ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¡Ê¾ÜºÙ¤Ï "man xinit" ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¡ËXDarwin ¤Ï xinit ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¤»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ò¥æ¡¼¥¶¡¼¤Î¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï /usr/X11R6/bin ¤À¤±¤òÄɲä·¤Þ¤¹¡£Â¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¾ì¹ç¤Ï¡¤¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¡¤X ¥¯¥é¥¤¥¢¥ó¥È¤Ï¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¥í¥°¥¤¥ó¥·¥§¥ë¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤Ð¡¤Âå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • -
- -

¥Õ¥ë¥¹¥¯¥ê¡¼¥ó

-
    -
  • ¥­¡¼ÀßÄê¥Ü¥¿¥ó: X11 ¤È Aqua ¤òÀÚ¤êÂؤ¨¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ü¥¿¥ó¤ÎÁȤ߹ç¤ï¤»¤ò»ØÄꤷ¤Þ¤¹¡£ - ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¡¤Ç¤°Õ¤Î¿ô¤Î½¤¾þ¥­¡¼¤Ë³¤¤¤ÆÄ̾ï¤Î¥­¡¼¤ò²¡¤·¤Þ¤¹¡£
    • -
  • ¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤ËÌá¤ë: ¥ª¥ó¤Î¾ì¹ç¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤Ø¤ÎÀڤ괹¤¨¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£Mac OS X ¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¤¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç Aqua ¤ËÌá¤Ã¤¿»þ¡¤¥«¡¼¥½¥ë¤¬¾Ã¼º¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
    • -
  • µ¯Æ°»þ¤Ë¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë: XDarwin ¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë»þ¡¤¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤·¤Þ¤¹¡£
    • -
  • ¿§¿¼ÅÙ: ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X11 ¥Ç¥£¥¹¥×¥ì¥¤¤¬ Aqua ¤È°Û¤Ê¤ë¿§¿¼ÅÙ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡ÖÊѹ¹¤Ê¤·¡×¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¤XDarwin ¤Ï Aqua ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë¿§¿¼ÅÙ¤ò»È¤¤¤Þ¤¹¡£¤³¤ì°Ê³°¤Ë 8¡¤15 ¤Þ¤¿¤Ï24 ¥Ó¥Ã¥È¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • -
- -

-¥é¥¤¥»¥ó¥¹ -

-XFree86 Project ¤Ï¡¤¼«Í³¤ËºÆÇÛÉÛ²Äǽ¤Ê¥Ð¥¤¥Ê¥ê¤È¥½¡¼¥¹¥³¡¼¥É¤òÄ󶡤¹¤ë¤³¤È¤Ë¥³¥ß¥Ã¥È¤·¤Æ¤¤¤Þ¤¹¡£ -»ä¤¿¤Á¤¬»ÈÍѤ¹¤ë¼ç¤Ê¥é¥¤¥»¥ó¥¹¤Ï¡¤ÅÁÅýŪ¤Ê MIT X11/X Consortium License ¤Ë´ð¤Å¤¯¤â¤Î¤Ç¤¹¡£ -¤½¤·¤Æ¡¤¤½¤ì¤Ï½¤Àµ¤Þ¤¿¤ÏºÆÇÛÉÛ¤µ¤ì¤ë¥½¡¼¥¹¥³¡¼¥É¤Þ¤¿¤Ï¥Ð¥¤¥Ê¥ê¤Ë¡¤¤½¤Î Copyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤ë¤³¤È¤òÍ׵᤹¤ë°Ê³°¤Î¾ò·ï¤ò¶¯À©¤·¤Þ¤»¤ó¡£ -¤è¤ê¿¤¯¤Î¾ðÊó¤È¡¤¥³¡¼¥É¤Î°ìÉô¤ò¥«¥Ð¡¼¤¹¤ëÄɲäΠCopyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤Î¤¿¤á¤Ë¡¤XFree86 ¤Î License ¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£ -

- -X Consortium License

-

Copyright (C) 1996 X Consortium

-

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, and to permit persons to -whom the Software is furnished to do so, subject to the following conditions:

-

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 THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, 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 the X Consortium shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization from -the X Consortium.

-

X Window System is a trademark of X Consortium, Inc.

- - + + +#include "xf86Version.h" +#ifndef PRE_RELEASE +#define PRE_RELEASE XF86_VERSION_SNAP +#endif + + + + + +XFree86 for Mac OS X + +
+

XFree86 on Darwin and Mac OS X

+ XFree86 XF86_VERSION
+ Release Date: XF86_REL_DATE +
+

Ìܼ¡

+
    +
  1. Ãí°Õ»ö¹à
    2. +
  2. »ÈÍÑË¡
    3. +
  3. ¥Ñ¥¹¤ÎÀßÄê
    4. +
  4. ´Ä¶­ÀßÄê
    5. +
  5. ¥é¥¤¥»¥ó¥¹
    6. +
+
+

Ãí°Õ»ö¹à

+
+
+#if PRE_RELEASE +¤³¤ì¤Ï¡¤XFree86 ¤Î¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Ç¤¢¤ê¡¤¤¤¤«¤Ê¤ë¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£ +¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ +¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Î¥Ð¥°¤òÊó¹ð¤¹¤ëÁ°¤Ë¡¤XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤Þ¤¿¤Ï XFree86 CVS ¥ê¥Ý¥¸¥È¥ê¤ÇºÇ¿·ÈǤΥÁ¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤¡£ +#else +¤â¤·¡¤¥µ¡¼¥Ð¡¼¤¬ 6 -12 ¥ö·î°Ê¾åÁ°¤Î¤â¤Î¤«¡¤¤Þ¤¿¤Ï¤¢¤Ê¤¿¤Î¥Ï¡¼¥É¥¦¥§¥¢¤¬¾åµ­¤ÎÆüÉÕ¤è¤ê¤â¿·¤·¤¤¤â¤Î¤Ê¤é¤Ð¡¤ÌäÂê¤òÊó¹ð¤¹¤ëÁ°¤Ë¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òõ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£ +¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ +#endif +
+
+ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¤MIT X11/X Consortium License ¤Î¾ò·ï¤Ë´ð¤Å¤­¡¤ÌµÊݾڤǡ¤¡Ö¤½¤Î¤Þ¤Þ¡×¤Î·Á¤Ç¶¡µë¤µ¤ì¤Þ¤¹¡£ +¤´»ÈÍѤˤʤëÁ°¤Ë¡¤¥é¥¤¥»¥ó¥¹¾ò·ï¤ò¤ªÆɤ߲¼¤µ¤¤¡£ +
+ +

»ÈÍÑË¡

+

XFree86 ¤Ï¡¤XFree86 Project, Inc.¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿¡¤ºÆÇÛÉÛ²Äǽ¤Ê¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î X Window System ¤Î¼ÂÁõ¤Ç¤¹¡£ +XFree86 ¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë Darwin ¤È Mac OS X ¤Î¤¿¤á¤Î X Window ¥µ¡¼¥Ð¡¼¤ò XDarwin ¤È¸Æ¤Ó¤Þ¤¹¡£ +XDarwin ¤Ï¡¤Mac OS X ¾å¤Ç¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£

+ +

¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤¬¥¢¥¯¥Æ¥£¥Ö¤Ê»þ¡¤¤½¤ì¤ÏÁ´²èÌ̤òÀêÍ­¤·¤Þ¤¹¡£ +¤¢¤Ê¤¿¤Ï¡¤Command-Option-A ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤ØÀÚ¤êÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥­¡¼¤ÎÁȤ߹ç¤ï¤»¤Ï¡¤´Ä¶­ÀßÄê¤ÇÊѹ¹²Äǽ¤Ç¤¹¡£ +Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤«¤é X Window System ¤ØÀÚ¤êÂؤ¨¤ë¾ì¹ç¤Ï¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£ +¡Ê´Ä¶­ÀßÄê¤Ç¡¤¥Õ¥í¡¼¥Æ¥£¥ó¥°¡¦¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤è¤¦¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë

+ +

¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤È Aqua ¤Ï²èÌ̤ò¶¦Í­¤·¤Þ¤¹¡£ +X11 ¤¬É½¼¨¤¹¤ë¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï²èÌ̤Υµ¥¤¥º¤Ç¤¢¤ê¡¤Â¾¤ÎÁ´¤Æ¤Î¥¦¥£¥ó¥É¥¦¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£ +Aqua ¤¬¥Ç¥¹¥¯¥È¥Ã¥×¤ÎÇطʤòÀ©¸æ¤¹¤ë¤Î¤Ç¡¤X11 ¤Î¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£

+ +

Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó

+

¿¤¯¤Î X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¤3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤òɬÍפȤ·¤Þ¤¹¡£ +¤¢¤Ê¤¿¤Ï¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ÈƱ»þ¤Ë¤¤¤¯¤Ä¤«¤Î½¤¾þ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ¡¤°ì¤Ä¤Î¥Ü¥¿¥ó¤Ç 3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤ò¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +¤³¤ì¤Ï¡¤´Ä¶­ÀßÄê¤Î¡Ö°ìÈÌÀßÄê¡×¤Î¡ÖÊ£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¡×¥»¥¯¥·¥ç¥ó¤ÇÀßÄꤷ¤Þ¤¹¡£ +¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤ÏÍ­¸ú¤Ç¡¤¥³¥Þ¥ó¥É¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 2 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£ +¥ª¥×¥·¥ç¥ó¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 3 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£ +¤¢¤Ê¤¿¤Ï¡¤´Ä¶­ÀßÄê¤Ç¥Ü¥¿¥ó 2 ¤È 3 ¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë½¤¾þ¥­¡¼¤ÎÁȹ礻¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +Ãí¡§½¤¾þ¥­¡¼¤ò xmodmap ¤Ç¾¤Î¥­¡¼¤Ë³ä¤êÅö¤Æ¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¤Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ç¤ÏËÜÍè¤Î¥³¥Þ¥ó¥É¥­¡¼¤ä¥ª¥×¥·¥ç¥ó¥­¡¼¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£

+ +

¥Ñ¥¹¤ÎÀßÄê

+

¥Ñ¥¹¤Ï¡¤ ¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¹¡£ +X11 ¥Ð¥¤¥Ê¥ê¤Ï¡¤/usr/X11R6/bin ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤½¤ì¤ò¥Ñ¥¹¤Ë²Ã¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ +XDarwin ¤Ï¡¤¤³¤ì¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¹Ô¤¤¤Þ¤¹¡£¤Þ¤¿¡¤¤¢¤Ê¤¿¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ÄɲäΥǥ£¥ì¥¯¥È¥ê¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

+ +

·Ð¸³Ë­¤«¤Ê¥æ¡¼¥¶¡¼¤Ï¡¤¤¹¤Ç¤Ë¼«¤é¤Î¥·¥§¥ë¤Î¤¿¤á¤Ë½é´ü²½¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¥Ñ¥¹¤òÀßÄꤷ¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£ +¤³¤Î¾ì¹ç¡¤¤¢¤Ê¤¿¤Ï´Ä¶­ÀßÄê¤Ç XDarwin ¤¬¤¢¤Ê¤¿¤Î¥Ñ¥¹¤òÊѹ¹¤·¤Ê¤¤¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +XDarwin ¤Ï¡¤¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥í¥°¥¤¥ó¥·¥§¥ë¤ÇºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤ò³«»Ï¤·¤Þ¤¹¡£ +¡Ê´Ä¶­ÀßÄê¤ÇÂå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë +¥Ñ¥¹¤òÀßÄꤹ¤ëÊýË¡¤Ï¡¤¤¢¤Ê¤¿¤¬»ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë°Í¸¤·¤Þ¤¹¡£ +¤³¤ì¤Ï¡¤¥·¥§¥ë¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + +

¤Þ¤¿¡¤¤¢¤Ê¤¿¤Ï¥É¥­¥å¥á¥ó¥È¤òõ¤·¤Æ¤¤¤ë»þ¡¤XFree86 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸¡º÷¤µ¤ì¤ë¥Ú¡¼¥¸¤Î¥ê¥¹¥È¤ËÄɲä·¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£ +X11 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï /usr/X11R6/man ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤½¤·¤Æ MANPATH ´Ä¶­ÊÑ¿ô¤Ï¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£

+ +

´Ä¶­ÀßÄê

+

¡ÖXDarwin¡×¥á¥Ë¥å¡¼¤Î¡Ö´Ä¶­ÀßÄê...¡×¥á¥Ë¥å¡¼¹àÌܤ«¤é¥¢¥¯¥»¥¹¤Ç¤­¤ë´Ä¶­ÀßÄê¥Ñ¥Í¥ë¤Ç¡¤¤¤¤¯¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +¡Öµ¯Æ°¥ª¥×¥·¥ç¥ó¡×¤ÎÆâÍƤϡ¤XDarwin ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤È¤Ê¤ê¤Þ¤»¤ó¡£ +¾¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ÎÆâÍƤϡ¤Ä¾¤Á¤ËÍ­¸ú¤È¤Ê¤ê¤Þ¤¹¡£ +°Ê²¼¡¤¤½¤ì¤¾¤ì¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹:

+ +

°ìÈÌÀßÄê

+
    +
  • X11 ¤Ç¥·¥¹¥Æ¥à¤Î¥Ó¡¼¥×²»¤ò»ÈÍѤ¹¤ë: ¥ª¥ó¤Î¾ì¹ç¡¤Mac OS X ¤Î¥Ó¡¼¥×²»¤¬ X11 ¤Î¥Ù¥ë¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥ª¥Õ¤Î¾ì¹ç¡Ê¥Ç¥Õ¥©¥ë¥È¡Ë¡¤¥·¥ó¥×¥ë ¥È¡¼¥ó¤¬»È¤ï¤ì¤Þ¤¹¡£
    • +
  • X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë: ɸ½àŪ¤Ê X Window System ¤Î¼ÂÁõ¤Ç¤Ï¡¤¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤Ï¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + ¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤Ë Mac OS X ¤Î¥·¥¹¥Æ¥à´Ä¶­ÀßÄê¤È X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬°Û¤Ê¤ëÃͤòÀßÄꤷ¤¿¾ì¹ç¡¤¤³¤ì¤Ïº®Íð¤ò¾·¤­¤Þ¤¹¡£ + ¤³¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¡¤¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤È¤·¤Þ¤»¤ó¡£
    • +
  • Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó: »ÈÍÑË¡¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥ª¥ó¤Î¾ì¹ç¡¤¥Þ¥¦¥¹¥Ü¥¿¥ó¤¬Âè 2 ¤Þ¤¿¤ÏÂè 3 ¤Î¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë»þ¤Ë¡¤ÁªÂò¤·¤¿½¤¾þ¥­¡¼¤òƱ»þ¤Ë²¡¤·¤Þ¤¹¡£
    • +
+ +

µ¯Æ°¥ª¥×¥·¥ç¥ó

+
    +
  • ²èÌ̥⡼¥É: ¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¤¤³¤³¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£
    • +
  • µ¯Æ°»þ¤Ë¥â¡¼¥ÉÁªÂò¥Ñ¥Í¥ë¤òɽ¼¨¤¹¤ë: ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤XDarwin ¤Îµ¯Æ°»þ¤Ë¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤òÁªÂò¤¹¤ë¥Ñ¥Í¥ë¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¥ª¥Õ¤Î¾ì¹ç¡¤²èÌ̥⡼¥É¤Ç»ØÄꤷ¤¿¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£
    • +
  • X11 ¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ: X11¤Ï¡¤°ì¤Ä¤Î¥³¥ó¥Ô¥å¡¼¥¿¾å¤ÇÊÌ¡¹¤Î X ¥µ¡¼¥Ð¡¼¤¬´ÉÍý¤¹¤ëÊ£¿ô¤Î¥Ç¥£¥¹¥×¥ì¥¤¤¬Â¸ºß¤¹¤ë¤³¤È¤òµö¤·¤Þ¤¹¡£Ê£¿ô¤Î X ¥µ¡¼¥Ð¡¼¤¬Æ±»þ¤Ë¼Â¹Ô¤·¤Æ¤¤¤ë»þ¡¤XDarwin ¤¬»ÈÍѤ¹¤ë¥Ç¥£¥¹¥×¥ì¥¤¤ÎÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • +
  • Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë: XDarwin ¤Ï¡¤Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤½¤ì¤ÏÁ´¤Æ¤Î¥â¥Ë¥¿¤ò°ì¤Ä¤ÎÂ礭¤Ê²èÌ̤ΰìÉô¤È¤ß¤Ê¤·¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç Xinerama ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¤¸½ºß XDarwin ¤Ï¤½¤ì̵¤·¤ÇÀµ¤·¤¯Ê£¿ô¤Î¥â¥Ë¥¿¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤â¤·¡¤¤¢¤Ê¤¿¤¬°ì¤Ä¤Î¥â¥Ë¥¿¤ò»È¤¦¤À¤±¤Ê¤é¤Ð¡¤Xinerama ¤Ï¼«Æ°Åª¤Ë̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£
    • +
  • ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë: ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ïµ¯Æ°»þ¤ËÆɤ߹þ¤Þ¤ì¡¤X11 ¥­¡¼¥Þ¥Ã¥×¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Â¾¸À¸ì¤ËÂбþ¤·¤¿¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ï /System/Library/Keyboards ¤Ë¤¢¤ê¤Þ¤¹¡£¡ÊÌõÃí¡§¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¤Ç Japanese ¤òÁªÂò¤¹¤ë¤È¡¤°ìÉô¤Î¥­¡¼¤¬¸ú¤«¤Ê¤¤Åù¤ÎÉÔ¶ñ¹ç¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï USA ¤òÁªÂò¤·¤¿¾å¤Ç ~/.Xmodmap ¤òŬÍѤ·¤Æ²¼¤µ¤¤¡£¡Ë
    • +
  • ºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°: XDarwin ¤¬ Finder¤«¤éµ¯Æ°¤¹¤ë»þ¡¤X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤È X ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°¤Ï xinit ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¡Ê¾ÜºÙ¤Ï "man xinit" ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¡ËXDarwin ¤Ï xinit ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¤»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ò¥æ¡¼¥¶¡¼¤Î¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï /usr/X11R6/bin ¤À¤±¤òÄɲä·¤Þ¤¹¡£Â¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¾ì¹ç¤Ï¡¤¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¡¤X ¥¯¥é¥¤¥¢¥ó¥È¤Ï¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¥í¥°¥¤¥ó¥·¥§¥ë¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤Ð¡¤Âå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • +
+ +

¥Õ¥ë¥¹¥¯¥ê¡¼¥ó

+
    +
  • ¥­¡¼ÀßÄê¥Ü¥¿¥ó: X11 ¤È Aqua ¤òÀÚ¤êÂؤ¨¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ü¥¿¥ó¤ÎÁȤ߹ç¤ï¤»¤ò»ØÄꤷ¤Þ¤¹¡£ + ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¡¤Ç¤°Õ¤Î¿ô¤Î½¤¾þ¥­¡¼¤Ë³¤¤¤ÆÄ̾ï¤Î¥­¡¼¤ò²¡¤·¤Þ¤¹¡£
    • +
  • ¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤ËÌá¤ë: ¥ª¥ó¤Î¾ì¹ç¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤Ø¤ÎÀڤ괹¤¨¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£Mac OS X ¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¤¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç Aqua ¤ËÌá¤Ã¤¿»þ¡¤¥«¡¼¥½¥ë¤¬¾Ã¼º¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
    • +
  • µ¯Æ°»þ¤Ë¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë: XDarwin ¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë»þ¡¤¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤·¤Þ¤¹¡£
    • +
  • ¿§¿¼ÅÙ: ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X11 ¥Ç¥£¥¹¥×¥ì¥¤¤¬ Aqua ¤È°Û¤Ê¤ë¿§¿¼ÅÙ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡ÖÊѹ¹¤Ê¤·¡×¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¤XDarwin ¤Ï Aqua ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë¿§¿¼ÅÙ¤ò»È¤¤¤Þ¤¹¡£¤³¤ì°Ê³°¤Ë 8¡¤15 ¤Þ¤¿¤Ï24 ¥Ó¥Ã¥È¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    • +
+ +

+¥é¥¤¥»¥ó¥¹ +

+XFree86 Project ¤Ï¡¤¼«Í³¤ËºÆÇÛÉÛ²Äǽ¤Ê¥Ð¥¤¥Ê¥ê¤È¥½¡¼¥¹¥³¡¼¥É¤òÄ󶡤¹¤ë¤³¤È¤Ë¥³¥ß¥Ã¥È¤·¤Æ¤¤¤Þ¤¹¡£ +»ä¤¿¤Á¤¬»ÈÍѤ¹¤ë¼ç¤Ê¥é¥¤¥»¥ó¥¹¤Ï¡¤ÅÁÅýŪ¤Ê MIT X11/X Consortium License ¤Ë´ð¤Å¤¯¤â¤Î¤Ç¤¹¡£ +¤½¤·¤Æ¡¤¤½¤ì¤Ï½¤Àµ¤Þ¤¿¤ÏºÆÇÛÉÛ¤µ¤ì¤ë¥½¡¼¥¹¥³¡¼¥É¤Þ¤¿¤Ï¥Ð¥¤¥Ê¥ê¤Ë¡¤¤½¤Î Copyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤ë¤³¤È¤òÍ׵᤹¤ë°Ê³°¤Î¾ò·ï¤ò¶¯À©¤·¤Þ¤»¤ó¡£ +¤è¤ê¿¤¯¤Î¾ðÊó¤È¡¤¥³¡¼¥É¤Î°ìÉô¤ò¥«¥Ð¡¼¤¹¤ëÄɲäΠCopyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤Î¤¿¤á¤Ë¡¤XFree86 ¤Î License ¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£ +

+ +X Consortium License

+

Copyright (C) 1996 X Consortium

+

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, and to permit persons to +whom the Software is furnished to do so, subject to the following conditions:

+

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 THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, 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 the X Consortium shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization from +the X Consortium.

+

X Window System is a trademark of X Consortium, Inc.

+ + diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf index cbf13779f..5cbac7433 100644 --- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf +++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf @@ -1,139 +1,161 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5340\viewh4520\viewkind0 +\vieww5140\viewh4980\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contribuidores do XonX ao XFree86 4.2.99.x: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Contribuidores do XonX ao XFree86 4.3: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro -\f0\b \ +\f1\b \ \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\i0\b \cf0 \ +\f0\i0 Michael Oland\ + +\f2\i New XDarwin icon +\f1\i0\b \ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Contribuidores do XonX ao XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Suporte para o Darwin x86\ -\f1\i0 Pablo Di Noto\ +\f0\i0 Pablo Di Noto\ \f2\i Localiza\'8d\'8bo para o Espanhol -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Localiza\'8d\'8bo para o Holand\'90s -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Localiza\'8d\'8bo para o Coreano -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Suporte para teclados Non-US -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i L\'92der de Projeto -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Localiza\'8d\'8bo para o Alem\'8bo -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Localiza\'8d\'8bo para o Sueco -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Suporte ao modo Compartilhado (Rootless) -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Localiza\'8d\'8bo para o Japon\'90s -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i Localiza\'8d\'8bo para o Fran\'8d\'90s -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Agradecimentos Especiais: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Instalador -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Membros do Time XonX\ Contribuindo com o XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Suporte ao Darwin x86\ -\f1\i0 Torrey T. Lyons\ +\f0\i0 Torrey T. Lyons\ \f2\i L\'92der de Projeto -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Vers\'8bo Cocoa da interface XDarwin -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Implementa\'8d\'8bo Original -\f1\i0 +\f0\i0 \f2\i ao Quartz \ -\f1\i0 Christoph Pfisterer\ +\f0\i0 Christoph Pfisterer\ \f2\i Bibliotecas Din\'89micas Compartilhadas -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Localiza\'8d\'8bo para o Japon\'90s -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Agradecimento Especial: -\f1\b0 \ +\f1\b \cf0 Agradecimento Especial: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i \'eacone do XDarwin -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Hist\'97rico: -\f1\b0 \ +\f1\b \cf0 Hist\'97rico: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Suporte Original do XFree86 no Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i Suporte ao -\f1\i0 +\f0\i0 \f2\i XFree86 4.0 no Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integra\'8d\'8bo dentro do Projeto XFree86 na vers\'8bo 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp index 37502eac6..573f84c50 100644 --- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf index 3cd250116..2bf7a8eaf 100644 --- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf +++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf @@ -1,124 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5160\viewh4480\viewkind0 +\vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp index 3e0710a2c..315f647c9 100644 --- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf index 3cd250116..2bf7a8eaf 100644 --- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf +++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf @@ -1,124 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5160\viewh4480\viewkind0 +\vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib index 230436b31cf6aa00ca0b02d369262f5e70c06aba..116e0b31639bcdd0151c460ec65d52e27ba9ef6e 100644 GIT binary patch literal 20851 zcmeHvdwf(ymjA8JgS>boyhH^q=!hr~1L(LQGXxOf$4f~@n9*6L(|waP>DP330=Vu# z#qR$7bakAKa3>K(K!PAXn9VEeM->PE~bwVPr{AbB7}#&FSM=$D?dwG#c$OyJGsJIaLcaS7eGa z;^fLZ(P-Z63YntBnq-m5_2EdsCliM+k2)q&RTQg;ggpKlwmizNESg^)40=5-XT%fm z$7As*^DNa-s%Un_r20rC;Ge8{y+0Q3@5B)0oZ9DoQkaB0kaP z=7Mr>L<{)=vLOyoC^|LZkMv#Ma%nW@mND13ex9o+%7qAL6Ut1bUU4ZN#jQA%8wbXHM?Y>^aeQKCiEiE8tMDxmbN`iQg2 ztCfdB&Lv7T+HH1)j4p4HO3n!CQwR=o1&XD@Ee+e-xFP-mRsIX z6o*bd+5zVJ8k9HGO5sch3IWi_c1C_G)24K`}il;#fg*Dc88>bm@w{ZZm5Ra~=*ohUK90sImt!(M z-r{H?rj61>Cx$JUTJQCS>)O|ad?_>!3C>U&r(Jhb0wh!7uf{;9-q!q>?sL{?6@mJY zOUuHHY;MNr&ULyy0Xcm@ZXj*W4ADs5+(5+Jz9lS~kI~#f6YMuLWD~JAIlcn!sO3#D z;&jRHB1Un+{q(lAq$JA1c%`B11(ZAypED?`&eejDXax|dgdn{wZ{azIqTOyO8~b-x zxqd!tmU4xnh_SPIC!0V}yho27zc68(e){RB6X;XonP;96 zPlB^|@7@GGDev*eA3xpP+?=@RqKlSMU3>@^(tNCM-@c*W|Ni$0^rwURL;WDS9653% z*{_#hemU{ti!UaCYe!pKTVmL-Vark1>J!1r>)pGzf9uw*RPM~{ufKlwop;_z96NR_ z@!osyiSX{b?aNxk1Km6ej3Gl*Qs7p$UU{K$RFjfm5c;JDL-hA`T z1Yn%`=%bGkCr_SCeE#|8iO)X!Eb+-FpCnG4I6--5(N5ygM<4yNU%!6!sN2(oL3s7R zcuk%=ckWJt0~lw&_~MI1M@L73K3{+Rb>ge9zDoS{uYXM(KYskIVHk;;nwpogv$JnP zUC2wp=fq2e2qSv+>b30dyYK$G^Uia_IS@wJ5$ zWPtM1+}zxI#*ZJrYw_a6Z-TEs+O%oY$KcPmufP8KX9@}mR-nu;5K0j&To4r>f&`V9Y(klfyS2V-i@#bfq0K#^g^II7A}a2j|Hm$Zvzp=B1{AQD-oycM%F1EqE+y--QDqWzOr^vs8ua_yxuwIJ! zgr0$>->N83mhsnMyO3th+R9jbRhk0I5$Y+W;9{2cx%Q?+tSyF`Lc<>hyv<2vTf*6` zTsb0??U6KPo2EgB-0TTERj7N_*`P{ID%8H(;Bl+rh%;m}x!xCw)gcsXTU#vpI%!Wb ziGPG`AXY`fD_Qq$&_{hwFpEaQnJQ#E-t& z#_Lqqt@Yu`yPRE%@uKfciir^u{Lq$Mf}GyYKKtAve2TR>n+>chRk5hCTer#e%(arO z@@{Tl=Uq5z)Tq?>pRp|)gmEaoQ5s%la)?r=j4b)(~#jD%nSHtaF>KahOMzP%VnRVQpNmi?aZ{}>C zpxeBDX{}-&bw#&)JKff#kiUX6?`1@O?`3u{u^lkA9So*6a!Rt#Wo%zt?g!d_x9Zj; z!$NAfoho|g@sAAGIlX2w^8Mg*r!4IZX({R#W}4JevXcxvPabmnj(O~DY(HgncOtZQv z0_FWSxpApo(r!*71>N7Dvs^Kjxg}{x+2z#bGvIQoQ-kfTs;4gC2VNf49dOk-{X`Q> zWP$lo6d7h8MkznVI#&Al;OY|V>fy_Ej30a+Vkt{wX|ocfaC<}`Yl+&@q^ONXu^hiK z5d29{F2}j@!sezjbD(FB;0lK^P2WvrwqcG&i_>b6V}m=&q~A>Q*OS{uq$!6$fM_|C zv+#MvlB#Bmu&G#MF8R1 zva8b@njE|Sh0di$k3DB87=i*){_Oe&XUGZPr@bhP*#O3(S)PfW#tDj|Oi-lxXbpDZ z=yDh)<;7_OZHmdHX;m;4)3(OFus&#;6*JRkg$1zaCa%0FboYxTX+Vi3EZM6Hd$>C3 zRtncHgbfkw${e24X)eSp#cefN2(6Md5$z0{){nn^W!Y&JDa?~v#Y>_k>TN2uYZR{B zC3ML$%7ji?W=-;TyDqu-0t>Jd`(;w>f1}_%BE)Tc$0{tPz!!32!V9{&X@fZnAzi@4 zCj})>mNad!%|p9%8Di=2Sx%Qarvht?5ZQ@g@4|YwH1ShnWnL#zUMWeL*6ISz`U;uW z_uQ>sQ3)a1-WnmDDWp4DESO-v`mp8?t4^0oBNZj~8IqI#7JKt;vg!3*QfZ?(2$C$U zsg+8>u)R-=!ftakc3VVA8x72@{@45Jg@zewA3VMMKq|6w#}5P6u&jWQEN2zoQgV6wQa?yr4csz*0(xGcL~?%zmel}@Be_qla~4P zA$P&W2v@;TQTA;C<%S@TW5W7~IO>&Nam5vH+;r1TiQ3xQGd`a$L1E#-g$ekw6LocU z;vMm`^XAPJvQ(1}!hiq4%qYAAUFir(Op+B`v2SIV-JqN~1WH*|>2dIrLVcE;-Ez28F^t zefscq>(-G&vt!$~ZNec*PEU$cp!oLf+eLsQvI9=6#ATOVwizO(vZF{rfjkdnnuS$3Om2IB>~{OM#r9){~r| zfG_%f<&{@^a*^ytw9(UzX}_*-wiMKC)Ew~-@9c7g+kVI%bebvwve z`oRYuB*Xjfzn`E$Y4k)p!~+SeWjn#S@WKllsXrfn_+bY*O3ArNPE!ixShNDYQyJoi z($dl{;ZPo&uBYHIJxdPHa|N_>iuwvCyd92k-odea8##^v<7;x3p6f$-fd4hYfn)i% z7%y@((zp{p_RPu2xfS!~rH3AR=+g}wHhc;``wULsP62r*!LOgX-R@W6{Pd$PZAH@j zav%^djYn9F@F2o^gbn8il=l$AQiLf8&^7`WJOp0k)SrZT|5F4fLe)6}<=uj^G}kXd z$VXrZ^r0usHF8?_M;L%W4&tr?fuY}2@4g^ru8ZF2!=w8E3f>QEQ#8rWwzShc-!{| z#P#&g&&li!($!U*A^k{DJ3J!W9Pi@Kk03jrIuFSNY&#9+ws-za*Uz`_3IKx}klGPn|!-8CvA=i*tyzal2FW9CVS@+P5@> zJT=Zv*mp(AeBlRldcEIX{QN1{v%Def#WBvb4*c?59S{ctK{PrVt4WFpw`#$h6b0HW zZ?LW7U>SYG4jWhHPpfaJcVl>#NEfr9`kI5}L&_Y;mjqJ*f;l!Q1-8nYtGPYc!|Y58 zSzeCxdW>|Q9MVTbwcPfYAKTYrm~J~)FYOh&VRS>-_ZBsN_H8xJhwc)QJZy9XgKB+5 z0ABoUfT_z^lLS4~W5k*3d}ak_~bYbEgSUb|>z)58*BhA(NGMiy`b`PBqo6Ow{=CH?>M#F9g%h za(etWp3TFd(ym2^z4_;aB^ zF`DM=&=gwT9-5K?mfY<_&a%d$iSnokXE}7(1UtHrv+}HmIdw*;NU%0A zQUszxEgTxPz&A~;(SaMh}A5;2~tdQ6EhHc>Rc*HcrA zJUW>(YkH;F^(a;6tGJ604um3}dY?KI3fCXjMycu)Edt$Ro+-*~GK}L!bg%>aX(J#h zu?GwT!s(BAQ1ND*MW_k5=|Ff`#hx+2!)7r~d5C@MYP2NI0cj!INgJ-bpYD`MQMRNn zJOjch@k&VsUG2LGL#Bq>TWfHV1o952(X?vXlWy>YPEYM1apkz(xDtK}a}VjD zjZKQL!&u^oCVgkL+-XFWC+OUT&*NPP*@c5Verg+s8?a+f!zjd=*gOXgL=7b8&RAr7_K50eQ zG&c_rCWw0Dl&Naa2?MYy;0)m;7;Xf?OlWQ%G+Ucrsa8&(I#q2LJL;+~%an;S*ZW=0 zV3=G?;MW@i;Yfum1!I8oXxqi4o=i>niYB6Kof_yZ3%DsmH8?yDD>(|44|wG7=( z7e0N8ybwO#a|$0iesaVne7@lr8adV&uCIK_**_4Y(o@PaxgAT6wc@i`WUR2CIqVl~`khe8S5&LJeUL64RH=imLh=OnDqY!9;hu-A=K0h>1=k zu9ASqF%``}Laoy11e;nLi3G=$mdX=1#vonof$C3RyPl)*O&LuqM*x(X&IyLJ>TrCmW9uEbsPU=zBKkB_ z@8@km>@JEO+K(9O?9<1T>8J3*azJ;a9VeFLtayd44#Mk3!uON?wpCO%%vrI3V&KP% z;%(oyF6ZoGeaA+Cx?j@&ZhF*d`ul{z>x98`l>08VTTzClFQ&nIUJR!KE+lfTlvVGc z$L*_;@CId9wIcQc#rkCH4gz;ZAg^qpT0Tubd`K_MM)JMz{o`R!(M8~n3s{)VZRCsxI2C&D-zVmG8P5_C0CT2nNstu{#K?-V+JCv<*hE6MXW z14RokL|~~Tm24Mh(K-9UH|YChtEBJ$iKY|2Gg`F-Wy*q^l&0^=l9PfHs0a&Jt<_-c ziX*(@xcVqHDO+(cb}{mN&?K-E=+2A@mU<4`B``Ess2D)l%?W2w*6xQHtqmI@alJa*XB)s{ki972jX zfu1QzPC~I8gyJ@?{FBVH#A5H%<-)LKjzdUakP?J!aE3G@*z<)T1giv7f{-gO(;R$q zlYV-?zW+JBb-g}*fYN2}}V(YLD(r=icM@Z~ou;O}9)7Nj%bF=j`RB{c; ztz`u7DXKG_0R4c_IYGHQsWxz=$1v&(#&VtBt5BZoehV^_&0I~*11m1!j*aU+Sxll!?Uu#${ET8_;`)~v zNk5G16|!a$7|z~;C~qLu)-$xQA1S!eF6;)NIYJgl+V^pNI#O(BP~-Y)B%p8d!a9*q z*=F_{>H~SUUc$;i7AZ@69m0eSM+zvK!jAwQm&H<}qpU&wyrc_AKP+pd=n>ajk(BCy zvJ9^vY^sFlw}Dh!zXb+F$8PggIk)shctbbMrct0*7k~npX@Y}#3P7f%q}SjrIrM@& z?<2*2xjL>_A;sQ#0p?;P=1sw=Y2rJg#!*?%#)e#Zl1MEW>IcY8YljU+N|F*=?Ac(E zP4>(KcuB{o6e;r81mgN>#O>ID7@uS$0pWQ_O12M1S^><8Xo)o}tj<}4(}L86l}L0D z>&-#wH1a}HASsD1{o+G{N*0TVC zKs%6vA4f2MK!N5x&@MzGF~9h62I|MaPNe{DBN9Ohvnqiq^n?^9mOjxE=p<;K@ zXaZ^wS!p-}AG-LTB+qyW&xS4pt}H-lfW?O3H8~!D3Cok91JZirSYta#R+7`b%>FWg z>WlO8GvOK{h*|b*7{_?cM6wQP8FKMCS~}PVW&9=G)^Z6kKo`J_(eoX!rm@~6I zRpyU^;Ni!wqy$2+1jMZbnI+STmv4c-jRDJSSAAq0?Y(gJAkuKha#wSXD-c{_OWZ<< zxxx=)OMQw`3&J?u?22H2z?QR3ly`YGXULYiQGmv+$AB&IF_9S3(h~PlVt%+bu!yK) zD;*=*F_5g=(9{r4a6ucx;0(FTs{-{AA)jr9?^^+i<p; zfm~{C?nlMvL~6AVxq8fBhY8#2H;YpBekzAfcPbT)_7Q_Hr#^zqY4$PTY}J+(ob^O2 zd2SG`MqG~|x^J`6yDgUYZBpps$USjPU!Sv1o1rZ!_q*pLJ8xpOZHwS)DwexQ__1Ym z0d*`=3u&2ZnPY+wRHdiny8^NrO>@R162T*2E-!X9l3jMjZ&IWBV{Khq!MHUkp zshMJIL%<;!q+yejC)JhbiSoUJT8Lahw8`R()Q3E`rCJc{Vj@o=jl8+7YxPASOp3TD zEUy0AQ8p1E`>cSx0rouN=`)h*y##V(VZ#NeX}HvsfS6glF>b~h6zNmpc?fbV^x8E*hZ>`Fu;g%flv7`~rQe)0tij;M)u=tgjNt%{6hyoL`SNr(_ zxY|%o_ZlQ8bi!BINY&ukPB~=Xi9zawA4%0-sp0EXQ&<+*jDY8BNhSqI&KCnG>w;jX z%4DhZtkag@mruy@$gEG=yD#cb(W;&G-be)|g|`!eeNdGh^H%HA9Rdnwjx}h>4bQBuFeexEr?20-jdf-KO85plAMtA%) z5!_@ibGE{0;jG%=>=&98^P$8^&baXjXFo)0Y@D%y zv%$uG_y+Nc{mP@p4V=wEF>>kQaS>+^017TIK0`e2p-jx2-vA)y2OzPvs&Rs|Ym5MA1Yko0zJ8CBPAL6I zcf|i4_x11?0yK=jKB1CHpkD7SjBu?a3aB*6WCk1>z4pCTUr zJ7j&t*;2&ejK9Mu$1gb`=>hP#qc>-35PyZU5@cgu{MP8jSqMp2!8kTB%A*m7SE><@ z|KKc+$Fp2{))>RtG{eVP9ja}~L+ZbAw!}DvpE58GqnpMY&MFLzv%g0p-SD$r2Ij{v zQ7nfmAE3(Se#QaL%8;;*I2qdjUnBn5ZTP~}UWUiNV0IfTXzXwz;BP3id!aFqGZhJ# z=FcJFUW|gHFBk(!!@05@k3VtN8#!=iaXj$0SmU^r@(eK W_nJOwa=;aEPQ{ISZBc-(@%|@9|C4V3 literal 20444 zcmeHvdwdi{wtrXNx~i_+fm5>sth)>w*tnqG$_Oe z)WS0SRa<{18&jhZSCvmG4~1NdK`wV%h55LwIjc!s*|e%zS{1_|XJv)+Wl5SZH?3-l z(LXiI>voq(44KrzX%!|z;}xIpN8-KQO-$2!vEYlI%27?Pw=s*ImKyUUNm8?jA9clw zyxHEcORgL>Dh^_(#6;An&$8x!QnP?G_Guy;M{gm;QJzYm7IR87NhXtd6u#$GSRE}Jm=n*5LfZl zoc+35lIYhK*cww-JsdemC_h}ct}$!yY1UX+CQ0kT5ohBdiQ)BL--6a>{Bm8OzFrB* zu1G|Vxa8Jn8t_u9_*}Bb>zBiIt!qQ|Bjky#&zMOXTGuW@Ts;W8{3KC1;I2iokhh^K z5b`Jy*(*_YkfXHl-3m*F=E6}2RE(jB1#A>`8^=#_4$aQVR9W* zy3QpBTi3~z6I`K%UOx!c1^hCYM&&wVO7?=45pua-5R)e@K#{@W^@@M7U#_OQlZd?j z>OiPoFgYT=Ar^Z?H2-62rn{_+v=q8MKHv+WKeXhina~CZJEvlCIHJ^(CKS5Oek9Vw z)lDs#YDRVSZ9lrCM+j;hizg9)og{R+DcI15L5GHAIy3;nL<3Vr_Ft3S(>6HL4~jD^?5;Jso-o zT}Hz}dC+hTUXL7(xI&R+t2IALT{WX|($zDJ7SsT}#+I5nK8o(!s=bD4(4e`{8*$g7 zl~lEtJr;?oRfy_lVgyV{hyJ@tdtsHPI(f^V81?zg9+hMS6hVKg3#Bf)=00m6U8SyW zE@)C8Z`xzky_mCzr&y9a#Z7xmxrpBWB)T>Yc9PY#dr&`ZaQPy#uXSyWGB#Pv-Y2Dv z&q9BmhW6~Df!C&7!r447?GUGS!!Lb z=F%Og4gIE+Nc95&9^`E7q`s0gsc$;&r{bV(K^^D?#Q#2s0q0s zo5+Yb=9qul@LeXdhYOOkj5UNE>RgaeI>x1sL_>Ylv7wxbHyA?-#z;@fpdJkd!>wy0 z5gNK3&Gtp-rS<00r<`4dW~1M9iHU|2YTl9{1O#|1nWJ#JOr;vd@ zCrksH2=iuRlwW`;C8-8Sh3c9!c#FCXQ+VuAp}t}q9T!-1$^D||pnqa8y}#)g`X`=+ zDRbQFtA!yh{YmtvKb15ccl1`Pd@%`MbR9ZqjX7!6!HDw(YG`VrIZVvEtI+?AWnn z-kH|UI!Vf4!g%wQWMwo?xEN;A>gJ55lu_?0dr~FifaX#RBABjGVXuF9xX$IXf@P1e z3S8zC>%?wjiJ6B=#t0|1t%fTs6apwNMt(zJ}=ewhRY#|HqmlFWD3{4`yU= zhDrEes1e9-I%evSm?V3TmlE>3{()h`HcoTEWBhn#hJ=|pZ6X=K*&tGU{MvkpY0B9o!^`U;Uf7u6 z#OsGw?~*Tuh4+j{a41*9LZgNvv(ptCnv{G|NA)LR)VqShj+m(gv5v{N3?_P8*37eatGPcLb@@ME z=KlHAsnR8qlzk5DrT>mU2BPHXk9^2WlHmr!^?}QTqd$rx*V&&P$1*cBFDfV~;DZJY z+H&QUS005scEJS~yirtCbT?ycG%{yc1UjQ7=oA(fUN?I5=r`xhn`hj1+iga3bF*+T zf{m)GDr3~BQTvc)KImk_rPC4of``&6Q>MIo%PqGU>({S8+1lFLzH8U6(|h*pG2VFN zjrOOWdg>(6Lz;u2b-l%tU030Q-{PyUzWVqjZyBIty!-CE#_rv_ ziI%Z$-MW)E-E@7B)y<}|JvPHP9 zTeljoyz+|i;)^dD;OX?rl`D-l zwPVK)h7B3gO9diC-@`|Punu6^IWeWySE_+#UfPd+gY z9y}=Ar=Nam95`^m_~3&NjP2XEw?FsXa|U$bPUJ0wBN|kBj@dd@5Mma`HOUvK-_U#)*-X0bW;;TE_Yy8Za zGdB|*&^UeU*fFE6t<9jnQ>RWD-+c3p@z=lp)i`|k@M&GwjhdR8ce1jwW*{%@9HHl= zO9gPldiLyj>s@!<_5Z*6>MP^q$&;t?XOL@eZx_!ePMi?Dty;C}i*wIC_qWJ11`al# zkP*?L`Vq1)^_+9gX@(x}M?FMd!I1SsJl=E9JqL#j8L|#(e+nnVQG45ZZS#aNK$?@2 zlXG`zY3VDA7A^V^di~`ik38~c=;wiJuf6uQ{QUgoNOL3HNI07pJc>V}LwZf&M2qSj zhPwlf+LrR(1-B56bdPBCgrht*FL)GxHm!WT4S>5GZW81_3y$hA1?~rMgW-zcI-`N$ z#2?Wkd68aFTlBFUJyU+6xA0T{ijd8uj4_Kb$8&~whIVDYz%s3HBxX6*GxUWO3+o2%Mn(SBEd5P!k?0g5!iybs)Cc_1*d6M}r|J1FLbWu;q@-cY= z0@#H0FJ`O%gzd2-o^BnTM|R0B?Z_U&@-U@LRs7M(03kU07VA_2fKd>a-dYBb4LF5F z#_&wV0}vzxlVEjoUXwbYX`ot!$jOt1tvA*yQsuP9{8)0(f}SmjHRZ`=a$wzN2zaHcumL3K(X=oM81+wL<{B`)%(_`JYeU08&Pnl_w0OAZW0Dxphu z5>+gm3bBxpQ||Lc1bJ6il$rp8%e4vIx)Ir;*3R#l@R#8&|Mi|gk zD#+wdueSlQc#GX`PLYjGrY-J(yPdIWrQ6Ta8VM%yDuCE|-AcFvJ+*r{T2&7fF`-=( zTou*Xwj!AeRT8*rkNJdanWRXs2ptoJd{;&ap=wEakV4mXCD^1`%uE1DL*AM*H?}GA zZUQ!O0W9rMU8gdCck%ToZwUJUsV5qe82?3AjFWm5LQn+rE2fmr(om%|W?)%$eIWSL zpt-EVII)t}y6WE?=#*IT&b3y&^EeyBr4urYaQrsSHH~nm>ED=lmAM|dV3vvcVzDc5 zRf3(X7Nb6<$uBUaq|rZ53~ik(#~*L9%LYi{=Il2^XaVq>At`02qe+uy2{;<-OdFDvr$O>J!2F+^U3LW>>S99+65y_EB;Qn>VMQe4_~*~eKssV?~@|0aMU z#te)WVr&`4*=wA=LFvd()>X|ZD=WiZttlNbdsvbqeZa<3F5>AAy2(aipXpA>B6k9T zKw%}mF%~0Enp7^We3w#;j_>iN1jgp>wBC`oc>|361b0?z+-Y?*47;#ukBWigXbCvH zvtw%rRBW(~3tC&1&?f?^!@dPk560k>5tmDAI*cCXm@72FQTBY!`iLRF&zZ`;WEN%_ zY+O<)V%OE&>y+!GVFeqNF1K4D3`}gvC;B;;);XDIF&V)AiD;U13=9G_D^6QyRwLd{ zDKYflBZmAf)QrFnwKKS>$wmvGrID+Kr{H|co6$*n%F&l8{cISMMO|t>Q?D-(V zrH3#h&@Tl$S|NQ_=s&4-9VT5Mf#!UR0z_HzXvZwUrAL#aEp^mnQGkG|aB83`wHRP~ zhLKIsbd-Q;6}p=9_P}z4OjHB8;Aq z<`|GH1E^KpqC>n0WCLLlAU=c&oghT#{rBHD$bav>_rx=yGlUvZILbM(di82TvNYr; zc@Pak1PFn;`FFqjodFc8jZicj1tWCLezy@eO7rl;4-*2l3V8|TAsXZgdiUSA1Y;f1S_m(Y|19iUQ;s5j+rd;Rs-1v>c0 zKmO5hJ`-X{@8GeG(6gaKhptJd)30B@Mk)_!+jj2UDG*0O9mx?|XZwWOfxf8wrI%jX zfew(TMv?_+v=J)y(MKN{BwO;G&-?f9Cz@@<+wkGTJJ12b)kyU~-Znz_4jnp_aG!nl znL&=i$VWM(0|xfiI?(Cgzkegu=kw1$ZzE)n&^SW*$Pp4|J9?)yqz@xUj_i~U#Q`Ne z0fg@~A#`0ilyidW3e?z1N1#nWLYENI2^yye-RtU);z0it(E$>AFWQTcF=}_x#~#_) z+4InE-g)rB2fx~|VZ&F@v%dhP?BEc06#Dv=$K!bqXq_K<=|B+muM9ZSrBb*>a1X$( zhuhGFqqqm*Zh@Nshsj6q0#EQoDD*h=`#EqfxT-E3#r+IvsjpuE*A0%r(I5HL*9c|p z2X`(UA)1{zila0n7dn4M^#OJV5+or;{Qb{D=+1$qf#p@|j!^Ct^Bj+`<-~>%mr`dA zE^SK9#igX3dDg_Rj`DF*iniylQzkNIl7aeNGG7yv*j-)Mx1h7_j{ReFhE^Txe zbiZ;k(ek~q@x8I}y|IxnqP{mazBe{tGW;($Hn{W*O&FGqkvd^;=?$_mI3Tp-Y|f?U zDT8G$bebWVm=LK{bD^^g|FF3r*fPz9lo`%s7zTtkXRdbgcmi$2*5g!{*DrP_%tiVD z)M}@|8oN!3Hbg!3IEL+n`Xqw--V}R>rDD^^PM%#Js)NOpz6WO}rJW=$y@w*OcR@wG zFNy%h4FIM_Y{V^$ceR;lWoX<2rR;jk(LuK4rx7|7UmXdXXU6H2Aq38@KU)#Bc~?+D z=jpNEXXgrbl}lU{5XC}Za_1EvNLqqZO-ZrlnCIKiD5%c_ZX_}t5`yY(9pJVO$BWwh z=uCW3iUMptC0f_o%)}XGaV-0c#s4{}3P(ioc~iZ9FHYf`d(ZV<6>L`X$XRx|>{Md2 zcO14_!a(cSI6#)(JT`R_RCfsK1}`p2EDW3bbig`y zYCss1&~q-D@mtgSZnJ>4Vt|vJ?Z(=Vei7f62DPQ$`^csPuh{cKhqA6qnAanQ$q2Bw zw@e()zQZxX-e?pVYJs}f5?}|MvO%t#7*dq0t{jeI$P1LZ2+ncRT@Vj#oqMaIXezqD zq4<5?np(us>ENl8X9?JIq+BWER#7+*ig=^-@^#n`_J@@bvOGZ?+_%m(rxzK@G~6>0ho;d9BjPNw5^|jO<zg$#4#c z$#q9so8oHEZk!{c-?WkmJWXj)>2W&FnYhV=x;D^7r!cP4P&1mhA830KvQTit1<|2M z6uV5;cB_1`WBW|(y$-c5$#}dWG^reDaQP{}tq$_VA?rA#dBXsgal|2N+B&U6)1dfd z)#qEkkXL5zCf|&)#JrbO4JOm>=nRuX0IkvR zbl9RQS_5Ul<}Oskl9rfks&T{SMIgBi6*KSf3ZmWIM=2a{|U&IVV zH)hOzC|hQn^)B?ulH{X3s5E6wo_XJyTz)e1JZ*=qby@?{meAigTS`qpzB#6tn=Xis zadvBAH43XfV__x9!lZA7;#-Bah+QtQsU6s(VU%00?c1Zxo2$(%)#l>vhIafILbqaZ zuc;c{A}Y8(q*N;*#ZQMuV)5mg(T)UnV0Q=JQ$R)FL4Z57hj8CUoU1hl(pgG<5Nm&h zvlGj3l*yYsx9;wj!81IZ1-Z0=OOH1OFT?%-Cg(~TiE)_sdNCQGgJ#kGUpzSkqa}ey zuygGFroN)x;t&*Fm%=>DfEdxg)Uyw0vh^1I@4PXaZyh71tA^%9GtT;p-QJAG_-kc2 z010g{F$=Vps0Xn@^+~i>jHy{vYeZzqJY!r7+jRAHbZ#Cs#U;b#5FC{63GL>k+VFvR z`8x!ujiIN*TsowoHk|ds+ffQ1M&b7Weu1}*%sAXTg%PEFL5*lobE3)6F4~QAku!$^ z+<1}>ap@quUr~c{=>@aBKBd_Ww={^rAtG>`ioiW2GkiaV4;`o-qbTT(tqQr7bmT_~ z2{rghDI$MO3@x3Fr&Cm7-f=wrmcmN8g!6Cc7w=_e6b>=>HXDOft78b=<)+ zwT5=k&1MIc7<=C#JHZ|&`DF*8k~qO+%J4z3fnq-(rn&Tcs$o0vam=jKn8>0ob*m3}6jOBtW0iBX$)#FWyS7Rco{Pet zCxMB}b$0Q+l6TU=_Jkhi?1F?8R;3q*t9g~8I9w79CW=FoU%Fg7aa`L=P1d*+KkKN6 zUNKOcO6}Cf*@f_KrHH#Z8?23^(9P7eMSHYRrM7F2rc>4@gr2Z&)SBZV&@42Ca!_TwJ-3Rt{F$oBxXL!b2|bORk#r^&b#7q&5aPJEYTm# z5VInv;c~E9NOyrR3d_?MVhcX59YPYPFn>S=9XDy)Eh}WRm$NB|dJa)wG+7xDNvx(S zmvn0f8cR|`glwp9rH~V$zeXr(Vl`o0TT1WZfZ}ynYY>O0Oj-#YKp5+Vu-r=79HEfr zwM2E}`*_sTrn<*qstACHMG(~Pl5Y<>*<2C!kvDBPGE#E{~di^R9 zmT1PT^aNmZl`{c`S-ciZ!q}VO@dQE=Esb*aQVK_ph-*VgA%!g0In#;`@+?A9coHh! zAE8jlq_)ur1~$dw6w=&^S5(-Hr-ADs1SFWidkF6!n`jae${1n;8lra+M_;i(?3HoN zIwzzJrFRk=8-(*IW(Zrl}!z{q z#^EP-1V`f&;ZO`SHLge}iDHPS(C(qA|9X4{;X2pifTPGUB8S_jxIzg!Lntg8_qhX! zprIltq&R|L`ch!GaBW~Ab+Sa-YiP6_K%ck>O$=cJ7y`prCqka`DikaRnMBf`EQdt1 zYrURia9E8LQxsG}gcFYU1;WY5sYItQ(GkZn9p7pRC(4>G(nS4~ z3R3HkMpb)@CYm0N;G(Uw@i<$tak<&I@;s1wjkuCQP4>JUp1a6A@ocwb84NeD)TiE6 zr%X{6m-{`_6Y{V)dVV7(LxPg!EEIT_nOV@JK2t!Zv%Q)V8bVnHnd4eM*_77MYiW-- zu|^ql+$q8#GoMj-Vc6B6j0ZARqu62*6sZFghw1ifG)OIJ4P^svELcadUd0C0^GP7#c0RobGN zib7IF^N>lPSjd|shjy+&6&?H!Hbvh-ZxBqAQ4b(2vjW$Yj)epS7_S zgcL^@LVc^m$A?CPHE%WU?S#!~H6|GKWe!Wuqhn)y_@vz`~PR%Iu0;$-n<7Jb+gR{$Z&R*xz>-uu0 z1BJ(bc)#N8MtC0p`9btxj8u5T)rvuQgMC~A@2|kh;H~``e(sm`xk#q-j7-k%M8F3? zC*XY!h)qZOQ98zqC;~9`_X4G-IIDq&rRkRlY{g++yshJGF1$w0X6Q>en~7)Oaf&{N zvsp-WA*^)--Okz1^^*X&@O(Eu>;rEzXA9u%;L?Xkhn{wyet@$d=ntXKAz&k_0}mW< zq}n+EKY!rNqi1mz(hqU=LqvYY*%E}`%Gq>y0E_m+1MKpRK0FIgK#6qy1ZM#}Z^f+~ zcz}yuL&j$?Si@U2Sicz`=g^OER*%yp@CW zFYqx6eMlJe0P}qW@BJD00Txz^_%Av8rH)Z?p`M3t94Z8tkb8#yOZ&>^v zMcn?W`eVSL5bz?Gn)LC%L|7Y_+Tp#)nHS-}txn+WIF}CK?a`a`sa(2CH}Dk!9q(7_ zW9GtJ-+&(=l&ke!oQ+2E!vQ@6SOn#D;|x`mKAxuU;p{y9M$WE9+Dp0gBto}yR*g4& z=47#cEh + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/XDarwin.icns b/hw/darwin/bundle/XDarwin.icns index 31dc1bdf92645fe2e5d5bbcc6eced51c9631040a..2dd5f786e27434add7a659709e8f6390b149dc8e 100644 GIT binary patch literal 69461 zcmeEv30PBC-gnqRaH*}@YOC#ZZ)fW=tzE3Pb)4?gcI@7%oi5XMx)1xJxk&&45fMcZ zMN!;PAS(pIl7xLv$cjWr3^9hQ2x2sf;{AT-2CZ9dXWqWg_dMU%J|pdz!}*`{-`A5b zKK>@0<1_i4FFp>xox|Zg_nmJ{;FDob-8lP?lRpfy`Kf|bLAE)=b56}am2mdMr#PIS z`uvOVhaTi`e3$v#jok*jfSEvBbn3bRU3**o89ozATUult^r0HHs_`rj|JNaG)6jHZ zo}%I)kGa96?$GIIhUt~G)t_LPv+b?4#X>P5V+|Fpx-$&jHkL>Sjg~ic9y+c*!(;e# zfTL04sy)ePd}x|t0?z4e-4*WTOyHo&qH0x-B{9LCma&oCHbwJUKJy#;kZPD=TBX%R zJq!&nuGUWc>#S_ASmeNe&<4c-kDlOMo0GG5AI%&qIwYWjJHG$?^TM9d8haugU=h9h z=4)+yTEK+hRvH|Ya#yCd@)>`cPSd#Kb7%6#&EeJ+-NhyL~)~> z0>+o7Gbvz>8yAiv;}&!sMF%iUS5!EkqW$n!eK_{2@Nk(0AMOCcEaBl%77L?J!VN4L zYf>%#ZE3m7TD=F)+%T~8^;aK0&eCS@`yF)u-8W5plckOEfmR&2!_U`u8;=Qg++D-c zrkLUcTR@xlH;vQgGY;oo53}hrLL1K=oUp8p`%km9(T3c#_SPd8XfrqAIln`=iSXZR zIh+U1fHu}SXAb&ueE-eT#(s;PVYYArL#1BYyjnAyQPbU`=G z)IaFNC96Y2XHq>w&+I3(S^v=7+f?Cmzy6ZL@d;-BKmX_XXJ3Id0}m7@h)Z!M%~x@5 zo^RtkIcJzNck(djyP#7XThLh_o8LJCz?pYItC$Hq`TDz3^;HDBdN&9?<%@g&aV;n|#^Q%`b&&d%ldo%@dC zbMF5({4c&D+Gs*;aF5Z@+11@=8(G0jJ;u29b#%7K>ukox`nE1}kLmPsX1beU+-_Q@ zZLTcrv|B4>)s3BoPVL!b?vOt)RzrcI*KKL9D{s{5EVTO=We>xrXIr-tp!Mo8qGt_N6%8h>$1WDz7i1(09j5An zV|Mbn#iZ4AS}40O?#*MS9T9I^k+rWwy?c~#11~xgKJGaG+d#0fD6>=F)Up?L!fm%` zwK{wZBjBDw=*ZBn&f@9=jm@?4>a(~kQP*0nh5(-8CA39RXjL~fsOzhHc}#%YV$$gh ziOgg-P4_61ZHAIYRYONh^$3(UXldFfV6MZzyA>(rc4wiez6I1&pXNgu+iiU2dP45% zyjreM+9=axa$2xKPLYyuhiQxt_Mk1A zR(q9Es{te(_>^(v?P`8ZcWyN>j80R&z1B|d zh|e`(Bp~``clAHteeKn^mwa)6(N<;WAFy2d`2@FXUArP9V2)n&_eKy5RxI`Eydxeqii8?^<7Ojt~gCha_pO-}(hbUb-Sx#qfE67;N zg~N1S6er>D?OWq$dsJ$wAeoDg&P(DHkkBHG0OpG0@b>~Pd?v3Th7#g-#<7Yj!Aref z_)|m<;d$ybDJ4WY>~0>2#|4v2gcNGFZ8Nb_=sxNtTw)3lLI|y$vIGzzWRzqp0e5#2 zD}$QWPCI1^^2#7Xd1*ExU~U3%t*NsIdI~^T5oEYvJ3!(yvxo$0%QdEpB+$JdAM?Q} zKnes?vMXb%yl}QB*%W40Q$P=C<+@~ z5Bb#QG}*6^KYAcDH+SpS&2lEVJ#)*ZOf;z#~Fl(xOx@$`!|~$QsC_592d`Kh7s-5{VpkN`z}W zFUX;5BE|6w^x?n@p9(>&%G%I;K@b^6OaKOQeD<>jvVr2l9(zU6pBPBK7w8@ERzqoh z%$JIbq!He^=P~T<@56~926EL?`Ii|;A4e#~nTqR_ony|5?|sgAsX$T;r-tHO@9WFq z9Acc0hbk_WNQ&`4`xVERL-|h582&S7%jF^o19|!}j&ES#{kl&$UtHBd?wjiCJEeh| zeebEO$RrHpO5ebpTOOM|>j;tAD-GnKfBHt$KRoYt&cZWSHIO@Rd{%SY@Bc8%kF)YJ z16lh}*!~9JDbpsvXEgs{AfW~tDh|hwX~It*W{4s`2?P#9pmDhD zPZmDe0{?h_a@jR!0H4D-4)`1&_NQMzPQeLM13r$y5Lo0CI0o6`DfX8WIOGa3fKPFT z0iVKQf*6&b4X3aLsQ`aCh$25HV{hgZ?tv@d2G{~OAXi}jVKMV7etr}`Uwlq7A~&Xn z9qDs8Os4(&O}+h&;{t{n<{<6}@C?)RuqTlT^H{aorW#R=yVq1eLsp55U&+1%VxTi2|tZS2%^AUhl8!2&GAmJS+@-E`X6P`~Tb zHkhiDqQZ*unzFKrx{i7{XVfsy<3A2Kc(|vzr97d+jJ&Vku?_h`N*W+3SGOsL;H7!U z;mCg25J}i!Yg=7cqTFajK4aq9j`h2QrBX2xH%-cuJos-kH5@?GR>v?|>(JC0@-ubT zVcc@!SXIedmaeEiP7#tuhnvt>A$2^-1Im&mbUwYpVx9I==ON3_zze4KHALyLX6%INSc zXTtRB3rj1?WH@453yv6o``{)#Cd6ZHuiv+AuhBY;I1h)I=$3CRkt@gvJ6dXSLO+6c zvXIu+8f00WR_yHyT=1Al9=CXhq)b5$*-_hvwUh^8n1?p1TN_t(;!be1hKCb9VT0>; zm&(h^(6-t__>n)nP2btjMqvcAz|AqY9i? zB9%x>E9HGiWn*)5o4R@HrVi^clK5n~)j~OZXdHUx$(({>iL^v06v@R7d_-HjR5iI# zZDw+ipkdl-v07;dMRUMIv%qY&bz6%{N{Wk1grZ&h0CRs`MRrWH4lLpUm9g4l9UexC z3d?T;6E|gT-BVOtB9iRcyypPzGSzJQNTmTo0TJvetkm$mTkpo!Ow#nk_hn z#f+0X$f&zd3Jw?g!^q_U#mjCGsl93 zTC)K^#&^f+2}HJVEOH{OKcOp$%4q9ou8{6oRqt?^jU;f_7y$&QnE*+|aw3d04}`nv zh#_~WrK_^KTr4Wu4g@;bKp(3uJgYAxj7Q(@#UpU*Inh@iv+t-{A(xa$%PTt0fEHGx z&Zsk6_*MZ;SewtxpdGeuebnBwJ%?Xsy})R;AJ6uy5PCM<@|Xq}5a-2TOyHf-o9EN6O&~QY11r4|FP3 z$vZSUo!P3(+FDd9m0)pWt@SK>V6(3Ubn|X|6RlS@7i|G1wK{Wu>FS-*GI0q`TwmkD z#-4H3ARHuMW(^x_TWeM}Ax_q6jg|w&n~EWqVo9mGsc{r1rp=Va&kC)U$lT+x*4HGjDL^(KyV{L&HX`9WKf?% zX?bI9FOhMcg99xw$I)4<+ffVw0zI|lc8=k`%|-H3$fUHoUU`f~8$~BFx6xg-#_|j; z4#Uz?XLdM-$4a(|N+m!s4y-x_l@2}_7BIID8`N#4lvWE(EQwVI5`l|6r+4fU$tB_v zQK`D2Z4BxbtNF~GbWeSAFTVk53YVZQgk7P0XwUIYg<|kUiKx6mwGYdEh(5e)*wR|3 z&)Z{kpwNRyX6^(+RIzG^&=KwH@Rf#0puk9>#!%%Je(3CT};d_y(br}JH7d(Qof>S;iWRFL98gq{gB#j1 zGtyUNWUN}1wRUxv)nU}t$_m7kE{H`nG!JF*h0uBz2b>Xow)nL-sK4Lx{yQIhrnhL@ zw&!kYMTAKfLw!O`vGUCW8SWfgy714hy#M~kZ@u!$b88U&Vij%))L|((^7*An2;{9g zp2i;>U^Mbr?N3Zs(&c``MEDIlUEKuf{@qA`Nd`tvc8OP&hz(`)^FzB?kdz(N$h|7fd zC~O%K70>0C6U%?Gw_w&Z)U<%@b|>W$3#&PesO&6R-{BPauakNH8Sl5HzCZ^M^@rw3CY}z{ENH< zqgKtH>b#c_=JC{V$t@zHmhlPlz=ZG-%$l0!8to50LMW=u@mLf|ke3YP4Li)5y5>B> zmKVDS6G2Qqi|2@F9+ygFjkrs@@ggAmH- zaR|^QGAatmH`YJUXk~kK!15LT0h5UH5^BdpMiZk=Ta6mg#_igx`3D?adj`8aDmEcD zJe*iAt5KS=m9YKQ{exka?g_l)n20@Ob!~i#?i&7qrx?_TiceW9;6^~$Eiv)hANLRV z%p5W98I`iJAcbpn>|Yhpd@c6?MIJ6UCOm$vY@^29wmm#ib4~An&)mf2Mnnh-tlAb) z)JkZ1D4-wn4Y1fMh!2mdwi@IG;mV(K4Inz3xiLF5<_6Ka@JPxLdM(d@$K1G+%XOH` z$_ti9MnplqUDGjO>|8G6sgdl+Tow}@(?N9j6^_AFI2}jxxeTKb?Z{Xb9T^+XJxtX9 zm5#ynuosrS5d|I(H#;Lf(ksJ=O|Iq_gbrJDr4f|HF|3G*p~3?q2ybU0lDNz*nCNjp zb8%sg9Z1nfkd=|p410K2dIgAi+O}+jS|xUqNFU+q_+{t?A&0%#DYy}`D3f(~odQRH z1W`ETwDDMbnNKiz*sM|2l)-yoeF8@-6%)iRPT=mw#uvE+Q=pC2H4wA&E&)x&2eXm| z{Ub(R^CFkv7OZV+-V0H<;1YNs;_QiI$%)T<1hXB+PK8W+iATUdzJE9`5Jnt=TWO=F zu|~}r9zsLbAz*5}vJE}NU5mKJ>ks?}SE|>GV2LmB2bf*ZG2!8nkueEeHE-MS3acZcqNBjRrNmQ!AvHqJ8i?M$ z!WRGvGO(VCnH>%GAch65fVOmRv-v8nfPnFX28f_yW)SXx$u}CcSsR-jIxmhd@dN~n z|6wk)3l)D0_K&up0@I|&b6nnY+>ofS>TXh zx?1>E73&;?ZAVtkHy|V=Fo^S;{!5bx<*92Dw_WfKCb~Z+OL4-GAkNLB7bg*#QdVd2 zE=eMcEJSt@+lB`DangQBBIs5n=P&E{!9n1d(f;Kd5D-YPsTfZpY*?QEQO#u@0+I+i zKNj;L!6>4*#*+xUQuD(}GURd>VImVXe%6WpoYx?|Y!X4adUajd@%FN%~IWsi4 z7FK`%@+AvCYWz_jArq^o&AjJl7UYxijzw^UC1>f=0IfRuQ zPQbLeUkcm4emV3vHP`eLNDkpce@^hs*uL$bKR4z5pK=tizGn`{XI|Z|w13Q>GAXzJ zr*a5;?&fehR9}Ag_HU;K_&TrcDxB1Vzr}{Xz4gX|yQc*EymIPlt^#rhJ<+#u_-9|8 zH}8?VXHA{p&-v;{a|p&&3j+Q)GQ^oZ=f|cXxJnujQbH&UL}W6L4C3$m-QB^AdFB%SnS8i zx>^pQl}bolJ)T2|2*B!4?}?>XsF^^#Wjrk3$`~YpJ1|eXaMJ4^yysYFl^*y zMYLRS7!FXJ8+^$zCIoOEJOvYaNe)52B0qZ9MGiwn5Y%UI=yj7&|4+F%hoDGKOWbjZ z#~=rn5}BL~BzLiB^X3pbSFOuhdT9>f%zPs2Krs~PG^BbjY} zX;UW#aGtq1hp=IV@GFw)ywqtpNcNsGZQ9fcKAeP$atOl2EU3~ey@m|v-cYQ+9_Q|5 za|m@wX<0k3nnQTUhb)~nZE_&z5AaXDIfV8Uo|1pH9Ky{90WxjV^}-p z9vNB5_>YZ^j*aEv-y^O;cM8LCQ$7AR+U*&oJpLzo`*sNhiWE6t5m?pKpjMS1SW^tI!KO~jvlepS4elJN4H{XWWu0JXYAhEj&_rSs~my-_HN|4 zq@>s}GB`4d9tw63kK4oUlS8__T|=V+X7Xt5;Nb%ea`C!RA>~1t$ zdRO%Y_3rO7>pRtLXbp7_(Ica1_M9@lm3zcJzTH|TU~GhTkh{$;KSJB8XUT4-wY;jbi`%%?yGgs2OA{?o4;N3mjTpZMhETIUJtT4fmvCb z3M4fRR7*;GNLzbdeMd)YZDmn1sDUH9hH!VveFM%rG&o2PUb2506Ep?@HV_*J?>Ezj z+N6cWyceI)u+=7;-3BZMom`Qz zMPCMCIUoSHHlQ33PS(>dO<9p5^YyvA1Wdq))8;$~(uSGR*YA*)mR2d1Ds@9r`-CR7 z9Jc_9ie1U*=N)u`FoV?4bX%j%LGi& zD2)paj)FE5OEYtKmnmdr<&`xmbu+&`w6#Ggufm{CTYdEofEsfTIvoxdpPmXZPKWan zP-vnU9p#OMjDl00RvXKe6BLIBdTJzPr60|EH<1Y%akz#&r`%w#897;-iYiox4;uTGK9_ts~308j)A^f ziL~~MrxzYUACueZ7#U?4h>U=_aWs8xzOcHXQdTNg09bQtYXe}(Dry1DOQ=8)!C|vI zDCbmwvfJ#JfTKqE?%)xi+1l%%-5`{0AMI?E3Ol10{Yj4m@+fT|LYIM`6SosEbF3@Y z6-bngHBza(qN1j*p}DTEra~sG!WdC|qq4-61VuCg0k!e%lWaDt?ILK@pwG|{H4-v3 zM7!)(i_L|BiO`d6V7yXsOY+NqDg?B#LAwiyRezh^Np3esow;FGnX0KuDl5bF)OBig zO+}fwtOi`zR$sGo6yShLJK8mDldRTW>qP)5S}+(4EcaS$>|PV94!d;avW5+dA6b^j z_zgLn7@G4R9CW(eAla6zO?xV8o2tapGP%4;1vpjcn3fYH$rO!N_=WoB(I zsjP3RV8JPBRH~|qQi-IZo^Xh&vMI@{t8Bdj%Y+`w1!xp#$Z=85Ac%i=FQ$e7s`2nZ zpGs0%{ptLt!5jV_mu=9Kj4Ciqq;AfU71`UMAL``*1Ps>HR8`1jLYcx#E)nLMf<}j& zphizO)ia^H=K?Uw&UXacfxK=Iion^|OFJ5*Qgg(@KXtKeVROQ~__>`!5Ux4R=^J*+ zRE;W`SSBkiQ&d$c@d| zGHF-Zix2OFngBllb*YT+5E1T>-B}y=l!HnVF(u=aQHntHpom0eHC`$eA{PU*XYcLl zHk(Z*v)K!X>J?ando2J#sDsk;Xw6}lwp`khxA@WMM8m*Vc0Ep1UM1&JEvkTMRqeBjm762#%W%Mzbc;*n3 z3DC?IC>2oRh=D%T0%{9hd>8{$p>|3cczT{81c1=~(&Lp0kl73|FMN0I z>!54kh?7+{tBKzNFyq>ir9nvvwiSs*WcOlF+Dn6z*nSjZ(QPsausKIh>HH1dy-uPS z;Y#!=CFM2$oc9z8CxLEPuf;Lw&H@>R9F9Ste|Du;H`b8ONbE0U_x2JP=*Og5kcYP8 z!o-a$KIBM))AhG6Uownta4 zWz}A}usErND)tqzlx$K;yFr^V@JhFl(otPJZGg^Twz|kr^T{UKrISlqHZOiO9F4hS zL+}|fF%7R5EirbR3s|1$VwGHDeJT37N^oReafo;v#f3m|uxAh>sRmtF7hfCDr8oDo z;sZaytdLX{zyH{)pk45Y!_os+!9AAEQrwC=;cpwD*2;)l6BKhw1jWG;#kjvfMAT*L zMnPMk_1A&hi0-O5JkZOMZ2lAd_+_`V*W7D|*<6n%pFu~jgSfK6JI|}I)Z&m58Icue zl~T;S4Pm)~^k1Qr?gA;;bO^RVn zDn-e~0lfr=uiVZ@Aa7w|x2 z0hSxIQkJ~?*efUDGLATUASHI-0iN}GXc_q5R&WL31>v|(lAv#|M93=%6AFuqB?=bJ zic*9%xUE@_2~4w%#V{<7}k+tX55svH!MFipS zD=uLrqfsfv?0AR=zu%=b^t#Zp7g~>KV4QkN1Th|0ugM5=>ZFH85RZ+m!=ol1L?qU3 ztAnr)bkSCLat-BRV}Wp@NJJ?41Gj&{TfG#_BHN&^U=T%MV`ix>e3X}1=OMLh8YLQBXA_*w$Fc00Pe9i)su zs)SWkNR=h;KlTF1c-@G-$DlWL_m1xljAWytK1#NCLgNy(0*d6ax~Qc>RE+HYn22e{s7?jgIoaCn07wXk^J?cpL|@SFH# zVbDqWC6z4JgHwe{0PG|P@^VcULR%IB%{rXWlSG|OQma;2}5$0SQWO8&Ptw9T;^`0F*>bKvmXvwA9G9 zV79_N%2Xa6u+>SV-Ej*aEJZ)I$Jq-Z?;^zS?!lc1b_C>ubT!Q>WV(*Mwv zzMeSAYFV)mw<iN?LbB6ee0aHlxfx7=#}=Tv$*lm3 z<%ILFRx&d#f@KFVV(ks)Ue;mXo9XqH#l<2SC7%so=yQi^kw}YkGuPC?iS64*A8Z3R zY+3y1Kj5Vj&8VZa)A0(1(FACOSQp(aow@NcXmEJ-Izu-*GBY8Ib(>o%Kr;B|Qc65i zBA1Ex?AW*>E|OaBa_m>q{hj5~D(U-AEIbCp!;tG?I?yQ$1{|l@MbK6-GcSb(2Oe$` z>w6K!9Y!(}UMCvN$P>?$maA&Z3v&~{dhh*kVNdt2zP_$1Non0z^B*<}nA@NZ48*c_ z0UWs|w!5uPS>I5; zIX&&GMG9Qhf5ZV!<^KfCMCPWe!bDu6>!RQzqWJ?l;C42lQQL&%qp(c6CH31k{`}lp zbVX{E>gL+g%*5!ovPokUafZRLi2!=@k6e@(v@tYET>~tSxTY3j9`4J}&KK4+ww9L^ z6>ZIkeCN66;!WsBuT?g+sQ0dj`!vdAAMy}43f@c7PXa|7!;jpR(sAHq`?Ji%XYL`u0vr*gO>a3~lFlZZ#*C$7<#FIWjV{Z6$ z@V5z$AHEh`2AO2mqSG$e4&*AJh!D~m^mu_lOKAd$FWKvYS2nx7RjX}O?9EO3*Xs*k zD$;39My0CVsO@NyY|YI~X+RW5oN>Su;I0o{6(+Iqo)bR`lHivDF9s5r$o=z}*)o$> zUCJ`j3t4(?Q(tXOi>a%#qd~T}Xz!kFBy=2w7Y76jaM1^^0hFZgiQ{tRH3>`(j(o2U zPA2?$1PboTu7>hGt0Lc7v?#`)t#vk3HyU-Fc!)?YtwPP9fW*x->uB@wi+{QrSmMvP zkNwzHbqLoIwL#Fn2u+6IKHe(QG*pT=E?x5cqJMU3>IYh?8+3Y2M|)e1OiBhM6-Dqh zp#|aGlbil&T+v^m9)1G504dN05`~Z4B;E?FaB8Y$dslo34pM144|i7Ab{VuC?d^4P zF^MRel%-9$CkYv#%Xk`JC_+j%owYCHU|GMw3zcHc=T-2FoALn_jvj&|K66J~e}7xK zbW6h9i(cBT)%AggI>AG5d@A5;A^ak#@gpRcVYh<_s#coW(1o=2GrOoE^eyZos7h z_s;%(c=oDHnDNvJqBaGCFv_=VBSkU%7alPSY zqV`5ut4lo;Qs?k$L$C8ic$i3PPd6*620dRF0Q|CH?LDMGppaGMyz%7AT{=liN42tp zi76z4s0)dyJWWoxW!EVYNMBFx#6M*j3I0jHM5;w*ydbH5dv!}GYTmdx*<}DMJ z$kgqfO$rgro;L(cVnT+TmTqKjsQAq9Nb;w>RM@)W~>=9j$7_Z4#w+|Gsv088PiFF^dU2k{Cp) z&S(%AClY7V8wI*iKxFGixE*2-UN2=$viaGOLxBH0iV~8kLaf}jcQCz1{ZN$_Tx(ZGf}h;$&6ETqY7G)ofT$mo;0 z2;~Z5D?dYS1pI$Qgwd}Qi7G#x_xv%28M5_lES9TkRTVN4A=a5(2Tj^`b-AcmguKu= z`DURS$TA-yWRjQ!LV|1RH3jhu80;Q<6fqd{DQ zq)v{U96Nh9^~_VGnrQE?;6{YM`-#Kt8A0TtvkWpP)7fZFU0N)ZD_dHcnouwz7!xBz zW$D8(=gwgV>df_L&z?Dcgk&5|Ufv`0NoS^zN+PJ!V?8u@^0epV3HS2jPa(C?-_x1C zsbq#fOYGrk`0*M!*u|TGhQ4hPzLFd5WF`%rkdz|?Q?N=fO_8=``>xGKw zce<=5jQTV-)br}zECEMY_2S5Rk3O>Aa^%#g`*5FL+eaG-$PH`RY6!?CscZl?t1BxN z+~2*gr(55llol3j*_68> zCnr-67BN-xo_p}2h*}d8c_&BRcD>f-F#+ai`nqk1?9_;Qq}8}&H6WIQh$2+2K*YU` zEmh*eox6ntA6GGdLHh#)`k>>$enX>V_-njLGGea>=A&9X%gKJxs%^Iv%3p?mLt;-wEG(^!D6?v9Rq`?R`- zWR$zA1?FgxTdwz58<1Z~42WV<-)+7D1J$3zVnl$DWyS{SC7oc=eMn{`TN)x8BFX+aj&kY4AR+rlT`0DQnBF-9@F12kh<2a#^By z7V(W*2<>VKC!QTU>LA5$uUbZ#2+bXk1j@MpEjxq9PaT&ZKD4h+k{$K>q6KsBnmKjS z)LS0?@cU1nyZ7eV_XAc$YMxN3uB<};K-;pURT~NlW%U+IyAmlJF(tYMxg+?VN>==w zfQ9J^7;s2B%OzQaNgxEo+_|&b0|Pzv(rp>vEq?m_SDyO)tU=yDVg`NA*}3@Wh5s?c+IKLu4gxCdxw z8qFdpb7BifA%Vv{dDuYP8cU0}CoOsL%fzV9UYqyZInySFO}qEi4?lVNceAG7a^KwN z-i9n}%rC^VEL)ORtleBFsi-I~!}AFukw6#%7t`xsB2gU-hZ*Hfi$BkG}W)C-ZN=ar({oJoNNyAIBuF+O$U` zOcbQA%in`!xKIQrLewBaNqw#ib`HcsOGOBZ+Nda?Ff^8liWVteklGNRd88b!X(jx` zj}|`Ps8v@;3(})LeChG~XJ0?*`g{NSJ@>;W@4RXHO}GDX{;NyANl06>I&sukQ*n$ZdtCMyE3W_gItJg7{kGip~RxGLi_o64N`Y}dXua@Pf zMJ#z??maW7Ou6Opk8?6UeD-&@-ZJ~H2cLTB?T`QU`I5hKm#^Nk2h|ir0k{vT*zik& zr10ekh0yteCL26(JOphRgx(K3E(4eFQ4>jLONH8$zdp9*(19LJYin~ygJkpa@7{jq z_qR-$IOF%P#FcD_e(UK6e*e1%9)0|&XBIs6#}{}RoA**OUr9+ZCG;sl%_)?Wvq+@^ zA_W=+A_gEVwu-H&S=l1;vqyCFA$?h~GXMSgaW-prS7&>x#?+@(?pYJ_!Lz@c1=gGM z;HzJ+60eW>$LsSS`t3b;-7)8uS)Z@mR3uj@@$^VBshjdyNCbNzk_=@9Qg9`0J{hD{ ziB#74%)(Jv5lfX&TJhDQ_pQA~Jo;j2?= z?v`b*zueMe&=`*#>T1I)zIe!Z`^xX%c=Fzxr}L)GnlbD4`yW~O(!zNU{^8y`Zo6y7 z^gC157m!*rtTP47k&0a~TR-wr3B`3gNg1pl$t5S-rZ5$(aIiy?FWa!>`BJ=pYCdAu zQmubzs4OnX7JUEV%TN5_?z`^2|F`$tHgo#488^+k?Vdl}|G?w(p8DgQSuduuMIV(M z`VMe>kyfUPgGIzCXi*VDA#$<-#tOEkOsa{`6L#pW*s`TC{I47J+D=nncUwcfT2ZoP zO-kHX@4UF+@yDNh`ni{1S~&OqTW_2?Avko>P4~@v{o@bk-8CDeLTgT4RjH7acforA z#nv29phwM(?R*#-O=S_t#y-yxjyTY;JtIH)eI6c^)*7@8%F5C`d8?9=sK^gqd3M3V zm*4sP-_a3YytVM5J7-P}3-ngz+fW$8eMa@ih5xo#m zAm%~;9&&WRC!cwq@P*whNlr`t>KhH7{O)Y2DJ$8rVI_ZA@`lyly|ZZHUq6aST)DYm z^XjGld~M$EZk;|kB+$<{aO!X0TvPDr6L-h0*et41)gXugJgQ_Om;{nW^o5sl1Q6N@ z&~Z10wg^&0egPh-!=g%yjr;1KsF@tuzNw^2*-|gx zkrDk5ueu5e@beG5_1Vb6xaVJ3nwD3hsH~6zqvVPNp`=v@v_pwB00|>>VUYhI@KEG? zzLvNbo!Q@ofBT-ewNYJFA>O$T;P~q+B*~xr?bY|bN!(DP)>{Mzg zKQ(I=|KA_K|K6ujE4Rt&b$y49x=)=sb9CU;*--$tT?#m0!p)C;z$?h#n7;$BSdk*B zn1_}PKrL6d1FV;(p^$kODp|}BtPY?O6=P{z@#(i2F$LS!r$l}J;gWxRvgG}@-~QlB z?)u&ER&4{rCr+IiJ9o_G8X)MpI}t+i-i(-O*4-) zG7-XtpuGk4|1Vp`Ds8s z3o`=hFjqpJJ#A9(gz5LK$QMfGm5K_gEKG{0g$SO-vI=!8)#2X;`ksJQf?cIYj(H%U zpPU=(Cd{PU8XjGo!H@s$^S{6Pmj&~mdG2o?hNtGk$LeJx5V$qxNXso6-T?Ya*!Ru8 zAuM>}E&SZQ6^$)zEwwd@GSs3;MO{)_fgaqB07Bxib7+-fs9LFV4MZ*3{6D-%}Zz zCAFR1Ms16_Tqc4=#=WJb3bj{wrMLo*`Ip;?_+*rgbWfkG27eh!lVZ1|{p-!YJiB22 zvoF5&Y1DF-#v~#k*gl8WaW+qYk{@EXLBwvC9AHao`1^|C*wPZJz6q!rCEavEIY8IjYj{;twAUK;=Ji{?G?l65|f&dv$arMrmCsNgIUGJf|3L< z9KhFC7Y-0F_#7^8w+{>spFBQT;dEGAgv-AV|Mr!q=gxcP#kW6;UAgsQax)~c0IXZs zav)%P+i*!_@B;$$wZ-eHf4%X{A8)%UDQnI8+>M*^cNT2joVO`&^Oh}CJ_mnh?bsud z7U#juK6B;>X|J^&fG=EQ*xymL_Iv8xI~G0v*uqyo_?nQs@duKV<_~0wkU3$SN%5i^ z=>?{ox3gKd3nv)p(^T)tUiR5*Pu%w>esW4;LTq$wTnrWE7abE5%ZpnO8yA;A2?Wd2 zb_@(1J?!Xr(Jnj*(V-}5sNWj*_S4TUeD<#k{`z5f(uE+DB{||`mlNqqltC%GkHeAZ z*IxVEYp=fc`rj76@#Y(gU;i8R zdf4CId~eCepMN9TXYC(2LJi)JDnRpA^=`oj^B#Ekk;k5Y<-_ljH0|da$QWzIFL`@4fWhdoMio@PiLL_`m}zAA0KH z$De)uOY^|c$cdAlQ|L^PY|P|+{n3Z-yu9eekKU0mG<_g^M|NG zU$l|)oHGfjy#T@gXHFd->^Id5bC<__`PReKL%x8Q_0XT5P8c|TdhFa7<2q!w8e5gJ zq8)kbR;|q0DN$*9A*Zb5A|OGEW4wU^VIKOa@l1-F8VP1w)(K4k4%!}QC7?ict5$_T zA~z>z{raqo?4r_RP;HDx&PGZQ|{p-1BVVe`uA&EO$QGT!}35KdnFXXC2TX2?Z~w= z$U;+NlSs{oEgB)Gi8gl1ev`wSIUrO#ePa0VAxFR6Zqc=9yKQOquzn1F92z*{-IZeQ zK6~cu=qb+$xBK`pr$xWt#oq5Un}TCC5nD?@#v8q}WS)a^Pr$4JTcEfLUuG>11%>ru%j=O9Uj-hFH>h{o;!Q` z_>qJA4f~KeM2EWrnbIC)`be6Y8s&^-F}~~t{K@%&C(7nywNkbjY`{L^IeGlpk%QKK zAjP4h$4{OCX+6fZltkDk_H>2w<(mR z1-rf7j`w?!IuF44!6dw)DKzO}Me)wtAchksjZq#rTkOq&qW{&QBfHC;O{g&9Lc{pg zrj1gVK&MW%Gc|H6eB# zRi$UdQ$?c*v3N)-IW=X4PiiWa639U0!Bu{?c$nq?Zl~B{Bl; z_0a%=%f!aT#zsd*gh$5kSh}bH(h1fN(;wYG-3cR2CpyJP(BZH)8*IoSll85*ZyG1w7%IGA}i<@QXiZ76{A68rJ4n zvSZ`1KN+w)KL>>U6Zu?DET6oF7lqBKaDTj?$C9BE;_)*kfIwvJ#%x_d0wMAx(?3a| zF(;ZI&WWHRIT5^Y|Hv3G`j7vdsUIBLvOT>~#1FUQ(3ej9aCCgG&$1|fxF7fjXAT^f z1A_9On)SiHt`d+lB|?gQFP`%OGPYyigh&C9O@)VGQ{Wl84tU1blw5nf2ip#puPOo! zGsY8KKaBQZ;}mQh7a;&H_+(>fAfo0ZN!Om}A%v@2lc!?|ciA)#kswY?D()U05yK;T zhCKXx?fD(-*Rdg6mzNNZ^vM;oJDh{qF)AfIC?fK_q$FQ^TnGE@+m_K-M1|XM=}Sj- zaOq+`H!uOp102f_4~0HCudP;M7~{u=bg<{4qExv&Ib4LC?qvfy*c94{6DI&Wg@HcU z(JKmQP=G1C%3Kb%8!1~^*q9Lsx?C}nLy+hb6E27d^{OI585WfXuRec4ihQm3I?eLABk-Ugth!ftZWf>lN;L7=%aa!cFa&zVE4Q{I9!-Ep+K&W4aaqfcEZn?SiBeN#p3=ehiY24U5j0a2VNyr3vu~ z2}_p}^04T{h8K_40Fy&fLYc^9ObT6dtcJ5+z?~iyPTWl{wq43y3P!qs&WlEBu;&@o zdFotyoCddtz6eObM)6B2?xdw$ib?>L;)yXL7`-q}L#VUH;YdkagQ&Yv+tLr@wFlqM{t68RL5A4mvK5e6lLcI@m7PJ3{7 zDlsx!@%?8%Yix#dRKN|443Ak#@soLpp~)0T5C4(4+8CK8BQw}^P?|PQpr1J|BVag{ z<5=bLspLtC$tlScH~_=~R=2=wBBL@;W@oBb<(YDb5dG{i8Q>PmI4CY6B7sUwN#msi zCFAAU$aq$P0+E=J!I4|D*XX<+;D0h7gT0|wf`DaiVsd&qFD)o}DX`3{73@4Rf+HiK zsD*ogj?VvVEQZi8FgiS%pPZIKrH7@ZB_>1>4MR{(zIPDa*K8;O>gD0aSreyJH3&`u)Y-hvw@ zq~*y)nF%nFiw1#Vk-uMM)TL=Yjj>k*z8JSBXB4XoX?K<61cYBL6KPoD1O``sPW2}Wl<+n#h z#Pbs%0`c)}CXLH<98~zt&T7Xp*k9#K{%!!BOqvPVX_h@>K>(QC9nU60_ zNa_CHnP|bd+(tO+DPSKKYD%xxbllv62FI*rB!qYTZw$168#C8tr{Wd-8zSN2T6Ma^ zy(qI4XD1^H3y(}74$m(<&cbJImh4!G5HuntF50HoIu3R;D5W{6d>}hAcG)@>f)H6HD4sjn$oo6M&`N(6QZxGQ%ZuK9~ju_Q6GM^t&4>DW+<+kR;MLQim z+PtEY-J7$L!KCm@)AEW$JJ;}|5yY@G{2xxNBr|tvHe|LIEDd*ITE(~`d&8O)d_Ffe zGCVdpS6W+Bl$VYGfu&vYe=)1FoVm}sEkz;ahc}WrmEOpB9zQ-NHX8bbzow|sR4XmW zhLecAhFA3dM`J3<%x_0T0_1xmH=eZH2?R*W&z(yd&19zb7ltPn=EPZlm`ORv=T3kz zi%-ifk`@*2r1B@MNsL8xf+b5DGZoVdSB|5Ep+WupI0|`7=!PRz(UIvn$&!oaP#7d1 zZbX`Zn~_^sxN~QIUS4iGz7iycPt@MVH0C-yHh0DBN$7>y6SkLj`bbkMidp<@ljEY9 z69x&08)6a2X5n)r`I5mA z;Fuj8A^lK;?sO*Ppoq&&hzQ4b!{Ct;kHauND&oa+IO5hE961LYL-|LOggEfLIR#&g ziKl-^e+?;vvjZXl-T@IFhRSF+;?00l05ssl>+?sdD6W58crp9<<(Lz`IXfG|BAjFn z((}9!GBQ(^LJtvAa_X1keFzu&?$Ks)VI%|~$Vdp~3`2v-AU$$=&}wLFP~*$C+|8+w z%*a)>Ry=kY;xcQz!yrKX1ZbYbH3aLKnN&s~K|Cu(0ln@c^wHBe-q;`yZ392dfshwo z$Q;NZh(V3ca1RaiwO30H;rR`H4uC{Z+4-V&7aqt98L?=M><9?xFag0gm62DFo4Y21 zmp&1hgs3>y{&yd6;@ckKb)YQ<&ujiL|3Th+A@d((Vh(TP2Y5z~^)`1>%;f#}MkjpP z&KhJ4HkWD+pye*aW9!n{dbLJJ36C2_WHdbwDq&4VS_+jG3OybbPw0~CMC36EkBE8S zS!DY~ei-~9({OkIaLhe6W~Z2`2PFU!5uUpY-=&h4k*{d8B1{Sy0|!`oy7abmiaQa? zAr`YBMfuqPluV@rK+;%99K5>Yi|4W^XE2#BVMj2?fC)SC;pe@N&nTu)ryVH=jEL~{ zaS17FHg8Nz$|$I4>jR(}v`J$!>$-ZOQsKD7rWGjUg*h2%$y8!c3Ni07Ja}v5OB#Lt zPkYxM-ej5OzuZaEgph_b4P-+!ObA9Ygozpr1dPV9YSpS$t8`}SXjeO~U7MDs*Dpyg zu{V0ZSC}IAQZLMifU+Pe2rMmE*}4ehFsw79%Z}q^msvLZd%vX6E4EmlJo{|u^YHKw z-`n?`^Pcy-=bYd9ef61lD9}S126_HYi4Q*|V7JP{?NnTX@kJNLMtN{C7L%Z)XJ7ha zXE`do*csx|Mv+tZGO1u`VG z50z~g0~CZro@f}ngPios@D4mizT8t^f-}70?Oktf?5Zy>%*}hLb8Tx`aaqfz?FUYS zpl#+?X8?&lHsFUl$SrH{=~>-c8z`ZX;-+!(nd3<^rsE+yN`kg;4|G(l>8dE$edf=9 z=zn|j%Z(Lo(#o$+G0qPz26pUIciYpo#YOAUc>mk*{FJ>-p zCXOB()lnKWBP-L>Q{mZi`s{_^fBo*z_DwH0mgRd&+Sadnsjw)}vi^p*M zpz8O{j_TD1n(~S;*zF9wFCEnU^^*^`t#1qDdrDt^cV}m%x7c6Ry7sl5ADlXOZeVv= zNtQg@gS2=d>hYv~kfg~6v)E&yIm&|5_tzsUSL{9ur00oa1E0dw=3n?|&z8>0{1wG@ zTaNARX{{=MX=PK#+Sj)4czx}fTRHdF{e5zc5Myh z3;@Cb_S*gdkTcr8Jq`OT&qIQ+e(gIa_V)g|t+u+RzNx9Ms$w%bUyAY&u|YhA`6&9M z8!`_m{#-g7REp3TK6KT3U$HQcR4}m%PcFSeoSQc&EmB4piQXs+TEG5{ul?w1y7m;H8z;Z`>{#D% z0?9@b-hUk5xuK(}v0>#)ey_JAu(F{B|0u$udH$wa-0EbR0<6MRzOb2awSp-vj0A6# z1#kY_`+wz zBmGDB@7{sgm^*jxJ9KdGwoR*A>MBqS$<8S(Yk0XcK$mUKN2d(5k(FDJm%GB3En0!- z7vT@Q7^yds4&fn?jk4ga=htReZCw{QjJX2GPMz%UKYj}1p!)kTS8VgfEpNVm{NMia z&0jw|x%Z7%+Ul^SLKMnMR_}bhq14yz@fNFa54q9!f&Jh?iyn}$Ju?~_f!8Pt>i+$m ztb(p}4ZZNUM^3=&9zTg0O9%HI-nVtbx;NfG`_~|#W!L{V+)mG`rkX&h4+<}A-gR(Q zptv*#R!3;=vLU@36lMkJ(il<#8VS`vDd_71rP&o-4ILO-b7VS3Na2kcaM~EM%F;zGzYdMqO+LDhr|fz;KWT z8oB;A(Zp2bWIoUn!C4xP$iOn^f9uJjn`-y> zV=h5|-?5{8M+QDQxbwB%Z3q8&sSL|}S&lhxgUk3Yn(QE{gSU5Li zuAr`*0w3ewP(mIKz$g!@|9wwkRzYifZ~t*jd+Pu2z4!LLhlv+&ymREw0Qqn(UHH?* zK+t%38FUGjv~O9}K-#cZc=C&p8;6H0M)MSW1kE(+kV@zfv_*MP_4UEZEKgI<+P;&g z&z}D0x8LaP*|>4@8}AN$iK(++0$_os#^3^FdD;0DudZ%ys4Ai9nI$DJ(DUKR-=Qb?gLk&Q zx#Ruge+GVPjWACB(C`rhN_F6T6Y@p$xGOF)d`*uV^5QjtB%}Kilfg zt^MG&H}@Sldhoq>_kMWn%ok|&jTr`os0!-8`sBd2_3d?m0$*-Hpmp8WT|2gJ?5eGx z3q#*V{b=w|gpd#A!5J6cap%_T*!aqC-`ev}yWTx;^4!;WT8@S}RDp&0V zn0M$HD2A$F+~+6XeSJ;q%1z*<%*ijSL5N@FEAZrGm$=zEc}0jGH=w_QK`o$}7q^k@ z>wjI3$3Sb7f6bP+_Z;}>JiZ=3K2V`582iWLdtP1L&_U7{xNi|>!Q@{;gH&E|@kdNZ zNFWJ7wxSvN+>y3ME1x*>~jPiDD0J~;CqFB<3O=KD2vt`^%?b(6LuX4B!nB zMhsM<=lf6H-ePt^Zb3sab&?E2!!&j>F$B%Ze>#VQCz}u|fXko)YVo-XmpVuzIhyJ@ z=#oQ2osvlgOsL797i#jaMxWys7cO=LSr_3Q(fEh?mZ-m9nt1O%Kis=tfmhxacphJB zC)5&5chz|eC5CNcVg)l@fuMxGqc@))>dnW02PpWnPswY$J?KRoG8C}2^tUr6 z)P*m;(uGf6pdySEK~@GI`08RC5!yxik{U`yQsy+7+;k1y_v9sg{_H?#2rii<6d)U? zFA|OX-|oKWf%2oawvFyw*~YJ5Syq(w>{S>)j=!?Dv*g9pyXJ6BVaAWrpL?ns>Z&U$ z0^SNKv1-Gr!1F1$sl-ac_z`N#fBeqnFM9HGD{{b6oRj_h6L&9| zS&8o;$8&YokG3^kf%K%CO=|hNE1mg$^XJ@j_aika(;j=|!8>ohE{3-k&Epej%}4qD zhp%$j-c7`GU;5-KY z#FZ46#p3e0G)4KYf%c=NxfIiQ{pm*4P}&dHH}h#Q!LnGDl#s>da`_z4gYGIrdI*TM zNl<7u*xX+0zIU;w)unO`@6^xmQ5?2_$EDdN z6rar#urI4(GF|#m^1B@k`4275=uXtk9ZB)Qy0{2?VGH;?4x8<##9-(JlzUJolWEk) zI%k@jOHvl6^rq;ik7oB^or%RtETNFc<+6QL44W$uLT(}TOq$uFsU`4>Wr^MCCNY>C zhBxd(KimCOEL+HIiba9+n9B$4Fry>ZvPsc;w6;}0>vFYvtdgwJZTp3ONDfraJRX~7 z3Biym5)bOAa58QCklfn#+86I#8mP9*Z%4oLh}L~r^+gwU#9`Lrz~~@5aSWp;SlxEK zc@c^O_xRm}9=kgm@{$~xT?y(rqX|7&pU=jQc!Zpq$D!F0E>9>GaziSLodlc5N6n4i z$CspSPu59Cvw5)g@_bY*OCT0PKd?CtPapvYZAdwGC}$#_{E*n^O)cd=TbA6LVH936!iimcM-Mz{4pL@Z1q z7K=oD9v9!2$fd;BaInB@*aIn)T%EpUlZWJ|=OLH_+ z2kYW8KgHq7luBA9Qz(=wwMIRi=nsK_@B}n624Dat@l8uh#nVpaJf@8a8i05|i^H$W zm(wb_Mx|0J)mp7eO57yGJAYiVj`p_d=kHqVuXf0-P}XChXYQUYmWN9V%0+K>jcmegGF$C2=Dn4L+xZ6f`=WRv`@gskU)wJ8+p7 zJ+e4`YqD0f7uBk9XgjF;ak|+O4Sr9Z7Jumtn%HS!86O#&x#MHp-cN=!w{m>u4%X*$ z{1lHX$2SdLokVXmsAmw@3K7p8o3{g3^;65pag#0|7f=A*9T773f>Ni`W9E=vZ!qaq zI2()wKQsbS0RP`YVzb5M#$5Ovv>j9%IT|80zH2fXj7F1*s4nC#&^J2_SpYl3RqVc( z=uM@7-o67}u$+;yR&Owx@o|$GBf`iDA(jj&4}llp!|!x96h3Tc6u0ZU89Nv^#O2B% z2iiQ{WVTq0ni|hN@{S=q4#4qi)2&@LpbX;A; zc|JsX;I7bhKyhhH89({(1h59M<{m#a4T3hBEH=u2T7#}B(heKD0I###Wym-$ojPfQ!)WN!FheRN3 zvz4|_x7i(bi;htwgiQjaL6(l+bk-F-XiM9gq7`kQ6iWx|_i+4tzQSm+IhMtD5 zRzx&dbaF@pXxE1wu*Djy-I+kUBu=Nz7$3tAX<+XlI|r`T=kB--zEm;q+SoZL1iEot zncn7bB__C>4u>_QXDDL!AT>v4drj8ex4OF%)H4UJk(z@Eb>)18!Qo6y!a8=FRX0=2 zXB6TJ@p5cwuk$=$OWU5J<8QrIPy!@>i07wf2vlb5Co#ccvzlSJh^oER3?Gu47cSxo zrXRhHiDSVjdCjN<=%*1T4EF6u3E>BJls=e9$~b{Awn|M<;@)cQpA?P#HyI&=b1L>CwN zDGf`YFgnu$MTtf!hs9EZexo_>AD&!1%j$Mp3{ymzvArN>m0VIqeIN_3b;{_`;)(>qUH( z#{2_vZp=nRB@~DhN+Fhw#jyFqFXt@3eSR#5tB^@n{16ZYaBl3KF;gjbl;}@pWSuiOaV-aD~_KjVgmZOAAoa1 z_xt9?!Y3X~beWYB@6jV~Z7q5F-bL|3tjiXu40C4SH5gLt6ap4}!Rzr%4?J~uaz=tq z_VDq(p6xXm58O06CbX*2Zk`nmvWRl00=D1}&Ldg+pWacFX;Cgba&&Wjn>+bd9kC;p zNM&*)JLkuV!$B&uqM#F6T#pM z8h_u6G|uA0?hKQJ28v~@G`tj45Tkg)V9X5I6&nXJ4c&Nfkat?Lr#j&GWM-r% zJB%}h%ql31PMm8)`6+DRmu9Kmouc<#!8IWDD&$HH&Qy=zNJ~vkahl?hSb$Ch_mc^+ljqn_uY=~3R1{CGnLmPK z0|^oZTdK7tre~z5r=_N(B-sr!Av>%#yW-jiHfC>t2`rzB;~|wajU?DWtiK2kCwp=R zq?nSNoRnz2ZtyhixGKAbW;}L{>c-~MXBN`bOupc`(d-(~+(H3f)hXCs3YNp|qX{1- z?fX}u)|eGSPK=_~s38X8rIdoDV=!x6R-P*@v|2)8s4_* z?7KxY6~{4*$*TeFi8wNyEs3ZuF_BK-+YNDI)PJyC>iDD@>M)pMIH|_px7X!A98Xj6 zJe759QVl3iC{S4v(lSz0lM=kHIP2V*VjdHwJU%X?Mtm4iF^o~;{+0&sasy4xVoPk} zF=|+Rl$a|wy3*j4k`kN_+Nrh7jTP~TADoqbbv})SL-;hFYJhz#q9`_Ba@+WP8gefR zz*3zv-S0_H#%gxj!L!VXMQs?Cwe;$A8kQk+8nuiA;fv)m>s9D9I*iQ zlHjz{Hi5%#*37`Dbea<8j!mcWY#3#6nNFjrttRu%nM$2n{-dkXX*|bcv-vWEE3>=X zgMsiin-xDckOlA=C%I!nlp34cS7zUDFj~!e-A}Ggso@Zbr7D9fqqWtOiad;!w$N7f z+_;eH=1hc9<4{XO{-Zb9;2ku{-^HjA#}~@9_Ee82Jtfg$v-r$>i}kwcOfboQh>R>9 z4|hQrHJX~esSamGn$!4;?_|_yd{%_d|VnYRJ*$zy{ryun2m zajQIir^DlM>JlbEsqr&`SgxflaaaP&m`z612u$X=h|C#np}08?0>c-)e^pz}Kisp} zUG35>m=LGNBA!@<>XBBfH(@EPgffTGqzT_`bH*puxO*FujZE)O)~hB)tnpKYNP-8m zRHoFK$gcFHreZY4iD?`$lIb4{i{T62ew@^GZ$UoNEbp8kvxY^;v?TCF3ay!}Yp=%^K13bX6hMc=@ zOzlm#EE<J3Oh{WI$CAmZ;L`w9|?BLW&vz(eMXvBj&LD22)0Tin(oa%o;Yx4{lIv1S5)y zR>okdS*RCq5y_L<*hrX$FSvwQM7l-g@@G0clV;Yqk>#UgY>`3-DXNu9QdZW*A?m%X zuMtoUUvMdL6fZbL#9V&^Uat0zQPOQUVXAVT!(kx*Q4P@CTQpCh7b6JdWC#>} zTuISgD<@53kT8oJ!r`b6fAD9F3Ejk!S&|d;u9asa`x%=~C4=MC=*`5-;K!gM`Q4)Z7p{u~9(7j9<>jVY;5UpvpnieDz#jBo)ugBhgbJ3;QYxB~&QywzkR{!1EzPE#J-i}0UAL>n0)NJ@xlV^wp-i_RI^M0bX3DwsAFumv); z!JdG3l*?)a1(a98lgGvgNxyT7Dro( zEU`xwHtaosc;?;prOtCFGn z4ws^r?dRNzyK3cdo{hwLd={H8h2L{bm}etC41QtO9mca^C#}9hsffpB)lhulmN2gd zm+)#N`Y0U-ZH$&luxiAO!>WOG*epJ~p1O735IT)bDUUyrbpL&K-DF%eIXaE_%itJ> z<6;P%#`Qj2hmF)v9*t6IM5#3XA5dwyZ+Sk0qLxnkV`TrF2uAkLA0xYbFuHzZ6%dtw zRQ{2aK-B&sDg9v7|3+5)QTa#ZA5jTJ{cl9YA3gt(6@OIzQTazy0#W}PQSnF5e`LiU zm48(J5tTsH|3*~&(eoc!@kiw!m48Gf5cR(i6@T>nM^^k%`A6j+Q3*u-Z$!l(J^zsv ze^mZa`A1X&QU4oJ@kh^pWW^tqe^mYvl|a=0MpXRK^B-C9N97-te?%n^^}i7nfAsuE tR{T-_(%p#@J1KH7d4HL_`opL=^tJ(ciC;`Y?t|bGTaZ>nCFF+Y?**wkAuajFy}ckSx^pKy zE~pZzJ&vx-^ooy*x4`jF5>f%e{WMW`ky=SclqE=$d~d{uJg@>$ZlE=YN<1ttNlO4q zd~&|#T_P@IaBxk0KnH(eWvv=F}Ut5s>XLZ$zd2>FCLJ8cu-h-s(ty=UW z5`-A5EdhST|Cgf#Ijv7x1FT0XCsBg0)({B>0hpx1`awj3;_7(e3UgP zlbZl^$pEl#ld>D&BhuoqleHeg$9XDCbk0>g;8GuDmOY#V?2uEBH56&6PJOVg9Dyy0| zam-Ylo+5q9666+^&}c+Bv>j0ZL(Qt-OXDioAb$x3@;9Oa@mq1Y=&jfiC^-Oi0P*Gl zjCccJ_7eZE0x-r;^1m6j4S5T&4gdcS1yDd)ioz|z#o;5u#g-!qe;5yX$u9TP1KXo-it%(gTvIp_+ zxfeWf;zj$O35e2YqQc7UKvH=>(prskzv`@4P>edX6&S_~OiAf2X*pPyQ(CGIZcW=nQ6c`zcN(d=M{kf+F+S#W141JKh+wDvKj`srQ0@tcM@bUuYIa!}6q`)AoV>m2-j7 z8cj@K`EEp)u`9+N6eXuF+=x=gM}%WI7eC8%_S_Hp=}t#ac$_=$8ET1)WVr1<0F8Wp zTr_*uyv3`-AUf^v#-anDmuWM^YNXzXMY;On2hW}JIO)9ZEc#HfU6*w^Yvymg~Z(_5CHe+eh9Oeu!N`$4Sv3P{wq$H*(fd4C#R zC~rRevKvIvW3f#vf#w=?p$EHR47!jgr42Sp#4s=mUC6@Cq+Oydh_1?zU6}}0qYDM8 z6oGa)BMCl?OQ+F=lBU2f`#@wdg~8V}1zo6gHGJm)B27CSDG|X~;zIi+ebI$Pzez1Y ziL7k)28**@nnz*`*kuFK0Eik2XAUBsVY@-{gL(|CI|QQic2*#5d1WdLA+B>lA3*N8 zti4Ghy3R5H^X)^;jIN{WG8QC~^iP-zJru}y-S%tgm3SPUC%0nQO*A{a&c%{CZ@egl@wP%uZoaW`p| zun%AmVFL+-qTht7;JQ7Ck_`zME}NKjh}END_kMu0HUQtCD$@tU9Msnm8<5#S^t8rb zq!E9aWMI`q&$wO8M}PU~FYn_o>*(A?qCfv`N=iy{+Jm3i62qeud)s)7hdOu8i$pF}jL2{8Q?_Z-E;1{N!ngMGl zYF@2wkZ28YW%6t4VC`;9nrIdt%+97FFjVR&)Bm8T7xM$D(hfR0Nz-|X+U-J7Pe$tQ zH%+7bejr?C^LiFSUZyf{! zQWvmc^xq6XY}0DJU=&GZwIEHqwG?Wo=n(b%Q+kA6C{T37(+Kx+80t`tS@5A4lN6~U@*m(D(=D7@ly|Tds5yGVH&qm)JQ=$ zrrl2&fNV3;JpE6~yjnLd2U-@+V|&j6%Bw~<^lU2lQ~rrlsh|7}lFau_-SlW*8*hUquFG^TLZS0yKZ3&d17h{MHH0m#EeR23Lw zK3@gMDh@`SS-b%Z6*zb&;(H5-)|e8J+@7*3z!jXj9S$I-V(_nsdSXfb5(+>OYG6VC zrRftCSeU;SG|X$H5AYo6gNXhsE=DduehcX%8x)~MxIi`tisAI&oj^n|NBWjfh4d|v z895a$EksO02@ zplIwNsFHBwA}xEAcXSADkPNfjyhEaCTyf!;kxQc=7WxejvoPVwwv`os2XzH*=yKSB$fCka(dCk=ih@SD*nvF8{UVYfJ)($&gXmfJ6Tdlt9v49ygeDS} z??_CT@#De(doZdz!}v83C8UhFTZ)_^xHXl`VcY^WqZiH%J^|Yjx)&b z9rdE850T|o{%(*yFS~0$HwoP?`-FE$RBT+FS`#0hjBZC&+&$hu#1+K8xc#*}CG|Mt z<#iS(xh%6N`QQL|Z%99=nomgNk?ncpl}{$n=4LtmTmo83TE`Gf5+y&*QGmq3zq z#QUO`8O4%58f-a2 zI&4r+CUTXy)Q5q@@jb!jOi7b9Az|hqiz#BynNpL~8$FQQ_ECMIo zB!|t`w#qM|g|qCszzB>fFwGidBC$*Y?MOr^**6kKU_=o`88Phu3+Z@raULim>~PB~ zLM@1JuMKV_n*4V)?how&)(~isL=H{7F_zrgB7*g}XHFYLBazF&C=<<^Y|#-$VI&cy zbs_B%xfo`WI8t(O81%yJAGoo6ZzDnE)Ev;eR{Q%4_H} z1x}N32ZBx$*PJo91Ul1^;1s63*U)J$G9*PXo(=>4NOGeSz&tH~;DIq9VOwKZk1;@$ z)Q>?f0n-4C0EKp+LmP|$B46|mW*W3j#DPW5lc84}`i-|7PjJX-({lXuoCt6ky=JBz zx&)c?TTKD1aL$WThv8Y8-c7V(tIn-vqqpRCvo+FFPP+GTvVWZHA1C|&Gn0K4eGH}0 z9~ys~DG{mp7R-*TuD{bCR=u>>zo6aW;ztGhs!ivJ5%}UPrVTXFo)M8@54z}tq#Kp@ zDC!liE-<>7r*OGWcqP7Md%A+|p3TEk8|oUc0fBH;Aw}PtAMj!_(^m8E^h$~fX{2q{ z^Wg{N8`K0P&wbxeR49KE@i}uELytO*Yj(}jGJv9<<11UPOvCYPVb4RjPEf>9)ZerC zXRJB1(0D*NyIK!EIAJF)H^O2V$q#taTG)dJ+t?MXsNM#q+5CXta8=<;-wKLKs(rGt zjEARiiROxFIz_#n%02RxRlLk^ak@8-CScX2KsIpHufSMKd0F}^Lik%(M?p0sbgc3ZTCXh_Y zGz9}stTH|^9qNN6eeC4< ztzQ8}RnC1EIHvvhPM)GP3V-|?^KNiV&=D|q)HO2d%^}gdM+73^)CB|_%dmIBi(SzJ z92RL0`lwVqgR8epK%`d{cWLD0Pq?&R@S%AWRouD@2ToC&>Vt2RkKR5O475l2WZ3UR z>lyGX0xZJ*QRtU!DXmik83_dLvJ~Z z;jQBM0cCx34G<-va6P%6emp!?+>vYMDhA||gcbLQ?<-&NBQ6TswN*###Y|mL_VVx) zGo1yULmpGqo$8^vJ+44(c|KMEi`Bt6vmbP?-UgrH?Gm=+@X;Tknq*)IseuBUzhI9_t0k)RYV`svn|}`L_XwEg^ihJ zB39yO97y%bj2A3F+KV(Gx`-{4szV8$e&gZkSZ72$Yr8JynL+KeuUp8l*XUhSOL9uQ z1^8-J+hVb|5Z;lC_9!s zepr6LAUiqo0Pdt$72Yo^FE1;zFSRO@mfkPQ%Q_ej%9P4S# z{=pJiaZ&!=^rZQ*p!9kCu&gL2@%;7$P4UgYUux#v+=F@Y+pft|J8$M~5|1(6@#}(vqYuB^B$eLyR zURFwVbeI>y-Kr=hB8*k343C1MgOi(AKzI$-LhS-Uc@iyyB1}`MOx-~7mGcSj8`VXK ziwKz?0Ll$0!rcVd`6^YX;~-n%e99-7D3{h+Y|2(YvScGc7altC59el%gf{Z)`z5~J5-&FwTOol%4w4H4lJUr?B#%>!!MJY?fZP_861 z1x5Hm)zcpo!)n_cwKncJ7|=6CE5bF9Ek>jB{umQ}wGAH3Hpi(_kWRDT_&Uh8qt!#n zOy{RcROkseW~yXG+0Rs|+66L}_pd(N<0C?L90lcRMuvqLUxGj}u(si2BZ9^qVWtYo zu<{F4ubZHl#~Ge>$mp=ECWpab42fk7|MC!Gc28!iSL4kY4B8WKOTY2U1eL03D9DZW zxYD6WAOvCV5HndaX(8H&gQA<0yH|}+go>MZ5R@0lWYM@1AtFHWHEnw0m2CLy>0_0vQQK)oqW_?-zURj6oSDsZ=eZ zF%~)0ibWWiXY8YAOkrlE{VbKr><%c#aK>kO`(!UOU6B7p$bTFihZwsH^cLc23(Eau z!Y7?sJy6w44YHj_&eSk{Y^eWE8!%W*i{P_)luD&klUQ_=i$x0NolVfiGhbV4r%d_{ z3zWem0fUhf8;l&(ve>Xo?oNlgS>lAr#5tcC=`b4ueUe}a+N)N?$H#>E9I-IBJ8a2J znrzL{#Te&P1WV8!b<6np*zl`Iwk}(~3pZXzD{$T?omn$T)hAWB3=z1v2!D6;1=AJ} z0$5vKR+5|Ivw1Ye`ZVD(w41<11$tO4nlxoJzL_p4Ey+u}VKoI~eTHxuvLbNN!RKw4 zPZ~E4pn39xlKhNF$8Rv!X9<=e1GO5Z2=zX&cIwzkM2h<*1=$Iw&`o+~^GlI+e2dud z%Pt#djhl>F*RlI0g?Cc|c286FxeIc78NwKD8E=C8AK(7%_$fUAek!?Nl$)VByLp1D z(LFF5cf{i|`cXV#-P3CEq)C_ujVZZboR^gxeq!^q)_Krw!&%>OydxQpJlp;7^>{qS zFwMSSoS&VV5aMY)zW|I*g~cb}#m&%*2iDCPKNa7>L?W*_X-S%}OGkGP%!l?pVv~{* zH4#^jZ2V^YRJ>;FS%Q3~Cu!m%Z(KZe&@3O?t;k4ARtFs4K7Yd0UU<8rq@?Ix2EGW4 zkBJQRzvz|^CRgrdr9_^!S~6)8zPF!RTvC*mNnQY2#!KR&LIbUGp_L1=l;mr_V(KL1 zusg$HBC<_h?P2&2ntKXJfMW zc7{=(l9B?#sK%08@G%$30u%H-j1)n;za29k_ZfRp9-3ck77XKrO(wJmswl;H?XY0@ zAQc|I7nKy{60U7nD8f}bv?Pg5PQuZ}gH&iARdx|3dZ~nSTPq$c(9CR}ZB%c081xtERn?_;3|UrFp*6KsKjt{Eyq zm6D!;deGRjV940)L^?CW)zSe&M0>oZsnR4QCTgtW9ay$B^vox$lK_El9F7GBhet#U zvp~WX=Cx$z-%CEb8e<$@#BF-={3T{V;`qXtWEn>$KH>iAW)kG~fTF+KDQyo#tVoo@S5R|~Xwy%QH%xOeuSD)0F+7;<1KB1vDsdSq;Vl}J_O$lhhzNMA z*T|MlkT{aa+b@{#((8Tlxix5k{W$Nrc*(&bYttjZpf}2pPs^Y(z|45MOAXe#go8m7 zI$dGd$Fz8p>lr33W_gn!Zyx%gU?93mgoq_Vba0}%JI5@S996;{CcU;O#oYuq40501 zMOx%en;dg+$lc7FVDJrz!O7=|6q3Wp9kX6qGDeLK^Y0vlOGsfkX1%^!Fisnh%=n0Q zxfF7D+8_`Nn$lu~TB8+Ox`IN!n@!z0s>t0g%zKFx*|7(R6vr@Ea%NL^4i35dIsgpz z&{DXg6x~IbAWtUT(YZTqS7fiFKNygm35u|GpsKeFv*Wcj*%K4x`GLWw1)La$C-A+b zmb>bElpUD*3Z%dkxsy)rCSvM)iAWK503&q=4^WIl=9rBI%Uoy7eRtCm9AAQVI0Ld( zI(fUq=D%KR2dR3W1-XG0qqrKZVgB2ZWF%>RTghsJiE?L0U7DMS`LCL!?_s-fwP|@? z2XB6zG5Nhf^M4Te@8|_`(P~}Ho$#V%D7l+RWa#lnSrBj4@Sus90SkmsV5-b-d$fwXVsfUM06v&%kTj^;eiDs(!c!|lJT1dzkSlhv zX;3xZFa@UfAc-fIp$u1rS&)#oahL*+qjQoA>jta(_<>>smz;B~Vfss_g=zlgXaoa) zkS(pnTYOZ=3B0jDwosYjHeaI+t|4zbbn&(kQ($@vrFKF)biNLXHe7~QjWp zbw4%2n-z|+q~A&font`q)q+XG`#Y;7{RfYkIUSEnI#T~nK5ygO>XjuPa zD$%Gx6rR|y|GlJ7Z>0UEf3slz{DX6(%QmfDJbj=V^i4d^op9Ru{b;-tA@8zsr{m#6 zj`sF;R`$}p7C+4!+B_a)E*DNana{y>M%H!WqK(^jnA>l$G?#7JynfNd-Yqc0-g@?= z&6zP_U?;;^kbZmm=$_@OL-@4=({8i4 zJ0Kl+;;_ZM_V~_SuCy~0DV5d=ksR5VwsCW@nBVpSzOBb=5E2yE(RI)FIH{!~yviXH zM}frrsQsFOziAspw?VSl&2i%xd_zwlBoQDT>F%^`s-ce-ML0;ixFM}JmsuR4AeA3* zwOQKzDvKlpBvwc5RuAygBDo2Ym2Qq3Mqbn62m+l9M1cLOp-qJB7t^g4Xkz!D(6~$3eOp zjW<@Fu0`U;D0*6p3>FDql-|6DoS;z+x5& zUSdH_|1?@s!Xm+$xd72lY5G8m1g|>{b4UA`m4O&FEygP=MA3_SmV>1Tr|Lo1Ju3$M z2~yPU`jL_sAYF3Qar5M+SQ&QMaogKSA=NmHCqX2>abm^W`HH*fVa& zwl$N@UVyC6wjJwde=hk0WTsnoZk#`~RT+rHh+ZyRzjM=~(Os0Kpr=qsuwl`TEz8IC zXePc75~CI-jU_nCCv7udIihXDiCojaXv_fIP6%YvW3Qrw{2cJwtG{& zJ4ScO#JM0fb9US^%@lLuY1_7}nB1#{Tr9%dS!AR{gr+(`Oo+W-ZZTgoL)A(l#_M6s z6uwKG&u-mN>}>nfmi2Q6wlx%sY_w*{1}V<>P2&`pmCL`|uzta?j>r(+0V0TH;!I)z zbW0QbV)K9n%NLC4icFyy7_#Za9)~R!bU~?A6Q+*o*-S1XcA6|w)V^om z?k32uz1FU&bktcl6hXyGBO@8!b7IIPqX!^26BMUd5{WbeJ7(h97lSr|rFjNbBeIm> z1R`WUKg;5Xr;)E8c8*1Xk@Gu(REg7)<_yE-5O*iU$%e&f)Go@guqziAar!Iwp?7_* z4U7^J7&oJv4HE>$d2WuICn^PjaS(=u*{y_uv8~HttA*XPfl(sDSY<%assxd73t}Ci zjf`T9jPu+u+Ej~-18KC^S$P6L+LA^qh>SE+ZDbT?Br=kj z)h0}<6J*-N1*aAs$D@)k{-9WUaK84(1%R;)M#i6x+W$0C8yO`cjEsnN%VZ;5L}L)=Bv{p29B9UA1gS9{7!d~s#@>X}wrF^U z5sZu&u&kGKPtuM#4U*l+>VOpOGX_esGK?0XpAlKa7#F9Iz+#-n;=sVz3$e~^o1qFNP=R74yYCK2g|(V`qJ4iU!1$*%Sr$0_MRiPO*-BwcN`EL35% zF<3aWzv3n6sd~u%BHxPOQU|71_A!C@m_U3?AU-A#9}|d=3B<<);$s5ASSK zsU4~NOTaZRp8VhZEZyd&yIfIY39ak?W5}Xt;HL{mV4HA+N^o0`gWxK~ z|C$Rd<#5)x6S$V^&{er1C*) zmsg`|!hgUsxtOjk(`paz!Ocq+NcdTXublsBImICq-Zy;_C^?_QmP&z+#x@~>vxITV`yHT$Y()w2-!IHtDZb)SkCr*AH zzQ)45s{?nl9B%x)IzR-?e3;-y z2`UZ($OcxW^p_)O9QgIocNgAO1$4Qpj>!EEl(yX1hE1SGyt=rNd_|Boy@Rf{n-A*^ zO(XaWktfU7)bHm4DsEYOp=ubz_&sf&nvR-FL(vd8!F*cU@NsTB$ns6~1kjo!q}t!m z!NKptwj!CQR=ZX^d8tX3d*+wa_nW!(uSDF&fumDLWd+B4@q6Yk)3}kkDsFYqtI^EI zvRCze&8)^K=281oTe_%Y+d`dVYBcicX8m7Vt1*muTjG zC6_GgVxU(3UTrM>aE2Qf^L`;ii)vK8E76(S1gp3F%#knquvHUy3>+#!Wkq#zHJ|u& z^TW4~R|Mp0RqJ2MyK?C!wYDZ}4SueFTb$FVZbX7~^HkkX@9e36C91K76=LHxr>?ot z6oS38&Ihns`p1SkU4TzFKQLqC7~?0A4hHIS0X}&C!%Yi7{VS1f7ZB`Zf8qrB&`MV> zch#W)N|y@=(oL@qr79RVOBY?Pt@h*+Y#|!FP727?t~znVbW~o|N~-vU>%CLO+O$cF zAcxVxK+O#epSuYU*mPrVU~5}Gmg!)i`tc;6Zc^JCi2mJRd@R>NzuNI+OYU@2r)$2O zlx_$OY`m&ZhWull@89I*@%xvp}}m8lc0xV475)6CXmZ_LzDPXp?cJ;L}ar%R+6G@6{qm zDQYQzOaY$1h9t-DMVbK?ENe9xz*S%y-}WB+!}nr?-^uf|=o+S2llWx0-UGJxB3Kic z-%VCy0MmOxx>^4LTTPVj^{o4V7SsDi{Na7g_2|6_ybD;@wwU-HpKjKblD!La1N(Ix z(4y}NPE8wdz}7%gy1@jb7#~326J$sYI$+a{xnZp}x5b#=3+83n2W>PPMp+A0eI>&5 zzS<_~pT4AM04su3hQhcnNH@_S|2W@o00V+#1k?K(+37!eNznk})z%q21K?k1YC{s6 z3p5DVhXC>G4Eo-e-03D45&y?7z#osJ?+MaPj{g7F1^7c5;(PoHO^!VN0#vgPQES7- z2yz_sJ^qEJfILP0?_5BTQB8V$5bOvVrq%{R@dD%4vSmHH zGJZ$UK+FvS<0Bv0TIyH|c|H6uTtIM~OKzmpOaEWoe6p$$Og8#hqkj7Tz6I%vsmFX)D3=EX|GKrpWXx*$Jd40nsElgXtZQG71n>g~1dLR}7 z8bRvI!3Zjwr3|LltxTFWQb-%d0FpOu+2PYZ{Ra*jJY*=AW&GZ5uCak!imK$euVYK5 z<>A%X=54!v*6)k{pMTb+brVH{G$7KG8JcwNH*(51-!1w6hZQSVZh62-wEweCt(qDs z1RO}~eN#yl3?49M>Nnrcoj&f%Pg^&_FHmue*I7aOjav5@K6ClTUu^duayfD=i6eh= z@wAbuZtYs2Dmfjz!v%uAUG?+!9h=w8AK%ZciGBm=8@1{&a_)M|L#Ms{ZiMhZu$Jqw zf5+;16Ta-xUdX{aT)@-b*~Mwk=B1NVW{n#pKj=x6%{vX4yv*Fu!}pdtf|LG9YE*!i ztIdBFO&;9SOu)fAT;Tl4V+Vd&J7+|XRz@;`7%#H`g; zXZX0MdHKh)M-OsSBK=O=Z{|24(^1#1oFh+BVasNX>HkTq#tn0S8$Mi{FAoL4CM`)eYAQoXiDUUP1|%Q zzj(@&f+xSfeEsIl>%U$+tO zN#pMIB%{d5MPbZti2MYmIe(V#zRv2XPef`#g@A*?^qA{pIxd_%__NMt^M&%(uGfA| z^iD1WCmq+m_-gL@Jtuvm(g+8y-u(Ud8{!8=nd(rV6MHu;o;qsC@ME=!3R-HvCVD4* zeq*1}q0J}#$9=bH-)X<7w8Dqa{(Sv6a`5WKvq$&uCWiYQx7)h<`xQS6eoIq8n62j5 z^RiecEBs;S)86`IE_^w8@n#2)YcZMkpS*be_uIF$4jvX~#fSKK9C12)((fHEpp#0S zjeDXuFoOOFWZ>E$yefb*8tCzo5Jt`|HD#*>rzFSc8AX-4J zcJ+N+KyawUq|qWhseU7j$s^}(Ja{SQUd6LNUi|ULAHP4Xd{|yy@#yj6$4{!BRh6aI zrYdN8kGBH6@6mU4Ni@QUY}%>s=(!sYc;C(_F0UYTD=Q!4KMwZv`HMeazWnR27mo}7 zB^MC*9^TcZsVf?_X#eSevGdm39QTb(%F512OU=wHDS!C5>Ny>h$dr6urv6u4K;V1R zfTXZ;gT^LiJ-?hVZ}kpGkIOf2N8Jv+?&}vEla^ol_$fwZoDEpsynI$xe;jVu;k3~A z2z7-~(^j2&4Vk=fgViCAivc%pUiUeB)X~nt^+K>Z=li|coRI*6@NYSR_OJMrw;5`F=Ke2F74WyeL8T`qMz+a zOxCUn3yvqdyo9b_yn0D+nWXfV%@j;>CApzdU_nEJlHL7nX(}2U-UR+wPE4pA-y`9HZdTn96d7{ zwLtsS3_j} zpE+%Ivf&geo}*4G0v#;bvj6Oj_?-Kdzt?Yp7yX#68-s@+&^NNKuH%Y`gP?n;P6K)E|a2O!y56v)Nh1k^l2{WJHL+*D>3Ti-cycMOE0q z>fp0sGgnz0@eWDMd&p<+9A-hqt0}i3)01FsHI~0-7J57QvZphd?StwzyO20tXE-qF z*mv}tHCD%bBGYsEowI;0SKVOJNV_4$;~vw#nOsNM%`2z(Z|BY#>NLA94(M%bzcF)v z-0Kl==N-AgcvE9$LoPLF-XVY^pLpr?fo;oYjAG7N>NUF#4kU7eCat^npRmaM;IDr5 zGmzQ6xdDA5hNlfv&Yt(abj8;{I$eFlX6p~Qz;&*1&Qyz*&IXdI;l{b`r$eUyV7}Ky z@Glf_^6`}mCWiEZh}582`yOA6oIGp(;$_RfU-IqOBl>n~$!zRv&32tsg^h#*eWMl~ z`iz+R?b07su3RN7E3vFtzHIUQS(8V8(W8AcMt-unXxsVIKB@tO1`i%QuwTzkrj3;i zH@lEJsneSUW7AGO`we7{56KZCUxo}BJZONb&!?T+HaBAIk18`TZf0WIx=mXwZA_cv z8KWS`*TnzsXF6LqZf@F!JwMeRqiR2pMr%`(W(*a=Fv)PqAuWB}t39cGf6WW{B1Ry` zzTEk7%?ddW=Fd?{_~p;L-{+)SK(l(4M#-O_*RCN!!Aiy+(KDabQGMuBb)34MJ{0r6 HJnsJhsyUq( diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf index 3cd250116..2bf7a8eaf 100644 --- a/hw/darwin/bundle/ko.lproj/Credits.rtf +++ b/hw/darwin/bundle/ko.lproj/Credits.rtf @@ -1,124 +1,158 @@ -{\rtf1\mac\ansicpg10000\cocoartf100 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} -\vieww5160\viewh4480\viewkind0 +\vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 John Harper\ + +\f2\i Rootless acceleration and Apple-WM extension +\f0\i0 \ +Torrey T. Lyons\ + +\f2\i Project Lead +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 Additional XonX Contributors to XFree86 4.3: +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural +\cf0 Fabr\'92cio Luis de Castro\ + +\f2\i Portuguese localization +\f0\i0 \ +Michael Oland\ + +\f2\i New XDarwin icon +\f0\i0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc +\cf0 XonX Contributors to XFree86 4.2: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib index ba1e3a206..77f345a4e 100644 --- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib +++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib @@ -41,14 +41,20 @@ }, { ACTIONS = { + bringAllToFront = id; closeHelpAndShow = id; + itemSelected = id; + nextWindow = id; + previousWindow = id; showAction = id; + showSwitchPanel = id; startFullScreen = id; startRootless = id; }; CLASS = XServer; LANGUAGE = ObjC; OUTLETS = { + dockMenu = NSMenu; helpWindow = NSWindow; modeWindow = NSWindow; startFullScreenButton = NSButton; @@ -56,6 +62,8 @@ startupHelpButton = NSButton; startupModeButton = NSButton; switchWindow = NSPanel; + windowMenu = NSMenu; + windowSeparator = NSMenuItem; }; SUPERCLASS = NSObject; } diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp index 4c83fe278..fc11e26d3 100644 --- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp index b27ad46fe..51cdb5c9e 100644 --- a/hw/darwin/bundle/startXClients.cpp +++ b/hw/darwin/bundle/startXClients.cpp @@ -3,7 +3,7 @@ XCOMM!/bin/sh XCOMM This script is used by XDarwin to start X clients when XDarwin is XCOMM launched from the Finder. XCOMM -XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $ +XCOMM $XFree86: $ userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index a7a0d839c..ca8a02312 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,6 +29,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. */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.1.4.2.4.1 2004/03/04 17:47:29 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include "X.h" @@ -518,9 +519,7 @@ void InitInput( int argc, char **argv ) darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE); RegisterKeyboardDevice( darwinKeyboard ); - if (serverGeneration == 1) { - DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer ); - } + DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer ); DarwinModeInitInput(argc, argv); } diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 79fa00ffc..e49c450ef 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -23,7 +23,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/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.19 2003/10/16 23:50:08 torrey Exp $ */ #ifndef _DARWIN_H #define _DARWIN_H diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h index 68a7ad16f..06e7b71c5 100644 --- a/hw/darwin/darwinClut8.h +++ b/hw/darwin/darwinClut8.h @@ -1,7 +1,7 @@ /* * Darwin default 8-bit Colormap for StaticColor */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */ #ifndef _DARWIN_CLUT8_ #define _DARWIN_CLUT8_ diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index ba1ec8fc2..d376624b9 100644 --- a/hw/darwin/darwinEvents.c +++ b/hw/darwin/darwinEvents.c @@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall 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/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c index 57bf5fa3d..39c5ba58f 100644 --- a/hw/darwin/darwinKeyboard.c +++ b/hw/darwin/darwinKeyboard.c @@ -37,7 +37,7 @@ // //============================================================================= -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ /* =========================================================================== diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h index c71888990..405dcf9d1 100644 --- a/hw/darwin/darwinKeyboard.h +++ b/hw/darwin/darwinKeyboard.h @@ -23,7 +23,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/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ #ifndef DARWIN_KEYBOARD_H #define DARWIN_KEYBOARD_H 1 diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 6b4bd75c2..ef3aebb29 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -33,6 +33,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. */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.1.4.1.4.2 2004/03/04 20:16:10 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include "X.h" @@ -516,8 +517,7 @@ static Bool SetupFBandHID( dfb->bitsPerComponent = pixelInfo.bitsPerComponent; // allocate shadow framebuffer - iokitScreen->shadowPtr = shadowAlloc(dfb->width, dfb->height, - dfb->bitsPerPixel); + iokitScreen->shadowPtr = xalloc(dfb->pitch * dfb->height); dfb->framebuffer = iokitScreen->shadowPtr; // Note: Darwin kIORGBDirectPixels = X TrueColor, not DirectColor diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 413dfd7e8..1e03cdf80 100644 --- a/hw/darwin/iokit/xfIOKit.h +++ b/hw/darwin/iokit/xfIOKit.h @@ -28,7 +28,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/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */ #ifndef _XFIOKIT_H #define _XFIOKIT_H diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index f3c80145f..69eb41d2f 100644 --- a/hw/darwin/iokit/xfIOKitCursor.c +++ b/hw/darwin/iokit/xfIOKitCursor.c @@ -57,7 +57,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/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */ #include "scrnintstr.h" #include "cursorstr.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 9d25c69fe..80508775e 100644 --- a/hw/darwin/iokit/xfIOKitStartup.c +++ b/hw/darwin/iokit/xfIOKitStartup.c @@ -28,7 +28,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/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h index 22a2f1441..feecf24d6 100644 --- a/hw/darwin/quartz/Preferences.h +++ b/hw/darwin/quartz/Preferences.h @@ -25,7 +25,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m index 4120b6360..cca2f695d 100644 --- a/hw/darwin/quartz/Preferences.m +++ b/hw/darwin/quartz/Preferences.m @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.3 2003/05/14 05:27:56 torrey Exp $ */ #import "quartzCommon.h" diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h index 3d3e96dab..a2622e060 100644 --- a/hw/darwin/quartz/XApplication.h +++ b/hw/darwin/quartz/XApplication.h @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ +/* $XFree86: $ */ #import diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m index 9b81bbee0..e0ee8d9c6 100644 --- a/hw/darwin/quartz/XApplication.m +++ b/hw/darwin/quartz/XApplication.m @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ +/* $XFree86: $ */ #import "XApplication.h" diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj index 3afc9177b..54b1d7180 100644 --- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj +++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj @@ -334,7 +334,7 @@ CFBundleExecutable XDarwin CFBundleGetInfoString - XDarwin 1.3b4, ©2001-2003 XFree86 Project, Inc. + XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc. CFBundleIconFile XDarwin.icns CFBundleIdentifier @@ -346,7 +346,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - XDarwin 1.3b4 + XDarwin 1.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c index 7b2c89f38..0adb4c212 100644 --- a/hw/darwin/quartz/XDarwinStartup.c +++ b/hw/darwin/quartz/XDarwinStartup.c @@ -38,7 +38,7 @@ * dealings in this Software without prior written authorization from * Torrey T. Lyons. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man index 312f4b88b..28efd1edf 100644 --- a/hw/darwin/quartz/XDarwinStartup.man +++ b/hw/darwin/quartz/XDarwinStartup.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $ .TH XDarwinStartup 1 .SH NAME XDarwinStartup - Startup program for the XDarwin X window server diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index 58c7ff748..5fef683a8 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -29,7 +29,8 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.15 2003/11/14 20:27:58 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.1.4.2.4.2 2004/03/04 20:16:11 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL #include "Xproto.h" @@ -46,6 +47,7 @@ BOOL rootlessMenuBarVisible; BOOL queueShowServer; BOOL quitWithoutQuery; + BOOL pendingAppQuitReply; UInt32 mouseState; BOOL sendServerEvents; BOOL x11Active; @@ -90,7 +92,7 @@ - (void)sendShowHide:(BOOL)show; - (void)clientProcessDone:(int)clientStatus; - (void)activateX11:(BOOL)state; -- (void)windowBecameKey:(NSWindow *)window; +- (void)windowBecameKey:(NSNotification *)notification; - (void)setX11WindowList:(NSArray *)list; - (void)setX11WindowCheck:(NSNumber *)nn; diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m index 1be22f82c..58cba6fbc 100644 --- a/hw/darwin/quartz/XServer.m +++ b/hw/darwin/quartz/XServer.m @@ -34,7 +34,8 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.17 2003/11/14 20:27:58 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.1.4.2.4.2 2004/03/04 20:16:11 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */ #include "quartzCommon.h" @@ -126,6 +127,7 @@ static io_connect_t root_port; rootlessMenuBarVisible = YES; queueShowServer = YES; quartzServerQuitting = NO; + pendingAppQuitReply = NO; mouseState = 0; // set up a port to safely send messages to main thread from server thread @@ -141,11 +143,6 @@ static io_connect_t root_port; [[NSRunLoop currentRunLoop] addPort:signalPort forMode:NSModalPanelRunLoopMode]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowBecameKey:) - name:NSWindowDidBecomeKeyNotification - object:nil]; - return self; } @@ -191,6 +188,7 @@ static io_connect_t root_port; // At this point the X server is either running or starting. if (serverState == server_Starting) { // Quit will be queued later when server is running + pendingAppQuitReply = YES; return NSTerminateLater; } else if (serverState == server_Running) { [self quitServer]; @@ -490,6 +488,15 @@ static io_connect_t root_port; if (![self loadDisplayBundle]) [NSApp terminate:nil]; + // In rootless mode register to receive notification of key window changes + if (quartzRootless) { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(windowBecameKey:) + name:NSWindowDidBecomeKeyNotification + object:nil]; + } + // Start the X server thread serverState = server_Starting; [NSThread detachNewThreadSelector:@selector(run) toTarget:self @@ -537,7 +544,7 @@ static io_connect_t root_port; // Finish starting the X server thread // This includes anything that must be done after the X server is -// ready to process events. +// ready to process events after the first or subsequent generations. - (void)finishStartX { sendServerEvents = YES; @@ -551,7 +558,8 @@ static io_connect_t root_port; if (quartzServerQuitting) { [self quitServer]; - [NSApp replyToApplicationShouldTerminate:YES]; + if (pendingAppQuitReply) + [NSApp replyToApplicationShouldTerminate:YES]; return; } @@ -1001,21 +1009,6 @@ static io_connect_t root_port; // This field should be filled in for every event xe->u.keyButtonPointer.time = GetTimeInMillis(); -#if 0 - // FIXME: Really? - if (quartzRootless && - (ev->type == NSLeftMouseDown || ev->type == NSLeftMouseUp || - (ev->type == NSSystemDefined && ev->data.compound.subType == 7))) - { - // mouse button event - send mouseMoved to this position too - // X gets confused if it gets a click that isn't at the last - // reported mouse position. - xEvent moveEvent = *ev; - xe.u.u.type = NSMouseMoved; - [self sendXEvent:&moveEvent]; - } -#endif - DarwinEQEnqueue(xe); } @@ -1194,8 +1187,10 @@ static io_connect_t root_port; } // Some NSWindow became the key window -- (void)windowBecameKey:(NSWindow *)window +- (void)windowBecameKey:(NSNotification *)notification { + NSWindow *window = [notification object]; + if (quartzProcs->IsX11Window(window, [window windowNumber])) { if (!x11Active) [self activateX11:YES]; @@ -1322,7 +1317,8 @@ static io_connect_t root_port; QuartzMessageServerThread(kXDarwinControllerNotify, 1, AppleWMHideAll); } else { - // FIXME: We need to hide Xplugin windows here + if (quartzProcs->HideWindows) + quartzProcs->HideWindows(YES); } } @@ -1332,7 +1328,8 @@ static io_connect_t root_port; QuartzMessageServerThread(kXDarwinControllerNotify, 1, AppleWMShowAll); } else { - [NSApp arrangeInFront:nil]; + if (quartzProcs->HideWindows) + quartzProcs->HideWindows(NO); } } diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index d3e302727..9b62915c8 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h index 650173941..63e2bea9f 100644 --- a/hw/darwin/quartz/applewmExt.h +++ b/hw/darwin/quartz/applewmExt.h @@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */ #ifndef _APPLEWMEXT_H_ #define _APPLEWMEXT_H_ diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h index 666061dc1..01f5b04b4 100644 --- a/hw/darwin/quartz/cr/XView.h +++ b/hw/darwin/quartz/cr/XView.h @@ -25,7 +25,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/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m index 2bf689ede..5feac6b42 100644 --- a/hw/darwin/quartz/cr/XView.m +++ b/hw/darwin/quartz/cr/XView.m @@ -29,7 +29,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/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ #import "XView.h" diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h index 74752f768..94133e4af 100644 --- a/hw/darwin/quartz/cr/cr.h +++ b/hw/darwin/quartz/cr/cr.h @@ -26,7 +26,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/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */ +/* $XFree86$ */ #ifndef _CR_H #define _CR_H diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m index 66e832b66..a2e97ff81 100644 --- a/hw/darwin/quartz/cr/crAppleWM.m +++ b/hw/darwin/quartz/cr/crAppleWM.m @@ -26,7 +26,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/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m index e3e83ebc4..ee69a42e6 100644 --- a/hw/darwin/quartz/cr/crFrame.m +++ b/hw/darwin/quartz/cr/crFrame.m @@ -27,7 +27,8 @@ * 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/hw/darwin/quartz/cr/crFrame.m,v 1.5 2003/11/13 20:26:31 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.1.4.2.4.2 2004/03/04 20:16:13 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" @@ -163,7 +164,7 @@ CRResizeFrame(RootlessFrameID wid, ScreenPtr pScreen, { CRWindowPtr crWinPtr = (CRWindowPtr) wid; NSRect bounds = NSMakeRect(newX, NSHeight([[NSScreen mainScreen] frame]) - - newY - newH, newW, newH); + newY - newH, newW, newH); [crWinPtr->window setFrame:bounds display:NO]; } @@ -206,7 +207,7 @@ CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape) if (pShape != NULL) { // Calculate the region outside the new shape. - REGION_INVERSE(NULL, pShape, pShape, &localBox); + miInverse(pShape, pShape, &localBox); } // If window is currently shaped we need to undo the previous shape. diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m index d259d0bac..6b5a2c8cf 100644 --- a/hw/darwin/quartz/cr/crScreen.m +++ b/hw/darwin/quartz/cr/crScreen.m @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.1.4.2.4.2 2004/03/04 17:47:30 eich Exp $ */ /* * Cocoa rootless implementation initialization */ @@ -300,6 +301,7 @@ static QuartzModeProcsRec crModeProcs = { NULL, // No capture or release in rootless mode NULL, CRIsX11Window, + NULL, // Cocoa NSWindows hide themselves RootlessFrameForWindow, TopLevelParent, NULL, // No support for DRI surfaces diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index fc390e87f..54223e85e 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -25,7 +25,8 @@ * 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/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.2 2003/11/12 20:21:52 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.1.4.2.4.2 2004/03/04 20:16:14 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "darwin.h" @@ -461,8 +462,6 @@ static void FSShadowUpdate( int pitch = dfb->pitch; int bpp = dfb->bitsPerPixel/8; -ErrorF("FSShadowUpdate: %i\n", quartzServerVisible); - // Don't update if the X server is not visible if (!quartzServerVisible) return; @@ -502,7 +501,6 @@ static Bool FSSetupScreen( FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen); CGDirectDisplayID cgID = fsDisplayInfo->displayID; -ErrorF("FSSetupScreen\n"); // Initialize shadow framebuffer support if (! shadowInit(pScreen, FSShadowUpdate, NULL)) { ErrorF("Failed to initalize shadow framebuffer for screen %i.\n", @@ -549,6 +547,7 @@ static QuartzModeProcsRec fsModeProcs = { NULL, // No rootless code in fullscreen NULL, NULL, + NULL, NULL, // No support for DRI surfaces NULL }; diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 72ad5ed8e..8abce2318 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.c +++ b/hw/darwin/quartz/fullscreen/quartzCursor.c @@ -29,7 +29,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/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h index d822c3e86..efcc4435e 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.h +++ b/hw/darwin/quartz/fullscreen/quartzCursor.h @@ -29,7 +29,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/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c index 420830965..98b8b6fee 100644 --- a/hw/darwin/quartz/keysym2ucs.c +++ b/hw/darwin/quartz/keysym2ucs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ +/* $XFree86: $ * * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h index 1d9183448..c7ff6f3b3 100644 --- a/hw/darwin/quartz/keysym2ucs.h +++ b/hw/darwin/quartz/keysym2ucs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ +/* $XFree86: $ * * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 4643886f3..e7bdb0049 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.1.4.3.4.2 2004/03/04 17:47:30 eich Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -156,9 +157,7 @@ void DarwinModeInitInput( int argc, char **argv ) { - if (serverGeneration == 1) { - QuartzMessageMainThread(kQuartzServerStarted, NULL, 0); - } + QuartzMessageMainThread(kQuartzServerStarted, NULL, 0); // Do final display mode specific initialization before handling events if (quartzProcs->InitInput) diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index 849e10cef..3961fe031 100644 --- a/hw/darwin/quartz/quartz.h +++ b/hw/darwin/quartz/quartz.h @@ -30,6 +30,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. */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.1.4.2.4.2 2004/03/04 20:16:11 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZ_H @@ -70,6 +71,7 @@ typedef void (*ReleaseScreensProc)(void); * Rootless helper functions */ typedef Bool (*IsX11WindowProc)(void *nsWindow, int windowNumber); +typedef void (*HideWindowsProc)(Bool hide); /* * Rootless functions for optional export to GLX layer @@ -103,6 +105,7 @@ typedef struct _QuartzModeProcs { ReleaseScreensProc ReleaseScreens; // Only called in fullscreen IsX11WindowProc IsX11Window; + HideWindowsProc HideWindows; FrameForWindowProc FrameForWindow; TopLevelParentProc TopLevelParent; diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index a3e6af127..64a4f33cc 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -35,7 +35,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/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h index 1d213e36a..e20c21ad2 100644 --- a/hw/darwin/quartz/quartzAudio.h +++ b/hw/darwin/quartz/quartzAudio.h @@ -28,7 +28,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/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */ #ifndef _QUARTZAUDIO_H #define _QUARTZAUDIO_H diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m index bba71c041..6adbaafba 100644 --- a/hw/darwin/quartz/quartzCocoa.m +++ b/hw/darwin/quartz/quartzCocoa.m @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.1.4.3.2.2 2004/03/04 17:47:30 eich Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -33,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/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.3 2003/01/19 06:52:54 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index e3ae4b850..a09475d31 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.1.4.2.4.2 2004/03/04 17:47:30 eich Exp $ */ /* * quartzCommon.h * @@ -31,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/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.13 2003/10/16 23:50:10 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 8abce2318..711ce64f0 100644 --- a/hw/darwin/quartz/quartzCursor.c +++ b/hw/darwin/quartz/quartzCursor.c @@ -29,7 +29,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/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h index 9710d4be2..4db5531fa 100644 --- a/hw/darwin/quartz/quartzCursor.h +++ b/hw/darwin/quartz/quartzCursor.h @@ -29,7 +29,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/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index 8d580830b..c434d227f 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -34,8 +34,6 @@ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ -#ifdef HAS_KL_API - #include "quartzCommon.h" #include @@ -45,6 +43,8 @@ #include "keysym.h" #include "keysym2ucs.h" +#ifdef HAS_KL_API + #define HACK_MISSING 1 #define HACK_KEYPAD 1 diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index 658832aa1..e9f9d6698 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -29,7 +29,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/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */ #include "quartzPasteboard.h" diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h index fef375493..296c52c17 100644 --- a/hw/darwin/quartz/quartzPasteboard.h +++ b/hw/darwin/quartz/quartzPasteboard.h @@ -29,7 +29,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/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */ #ifndef _QUARTZPASTEBOARD_H #define _QUARTZPASTEBOARD_H diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c index bb7c7d214..5a11d5321 100644 --- a/hw/darwin/quartz/quartzStartup.c +++ b/hw/darwin/quartz/quartzStartup.c @@ -28,7 +28,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/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index 8985f7b11..e2e97b4c8 100644 --- a/hw/darwin/quartz/xpr/Xplugin.h +++ b/hw/darwin/quartz/xpr/Xplugin.h @@ -30,7 +30,7 @@ Note that these interfaces are provided solely for the use of the X11 server. Any other uses are unsupported and strongly discouraged. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */ #ifndef XPLUGIN_H #define XPLUGIN_H 1 diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index 3062d964a..0eba61cb2 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index aa595af85..17f9e91a0 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h index 350f61b56..5d0b1fec8 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey 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/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h index 1a2949b18..ae1b99db5 100644 --- a/hw/darwin/quartz/xpr/dristruct.h +++ b/hw/darwin/quartz/xpr/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index ad36204c5..632ffdb33 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-hash.h" #include "x-list.h" diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h index 2abb08cd7..97d4cc40c 100644 --- a/hw/darwin/quartz/xpr/x-hash.h +++ b/hw/darwin/quartz/xpr/x-hash.h @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_HASH_H #define X_HASH_H 1 diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c index 3414e1543..dcd34fdc5 100644 --- a/hw/darwin/quartz/xpr/x-hook.c +++ b/hw/darwin/quartz/xpr/x-hook.c @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: $ */ #include "x-hook.h" #include diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h index 14e8ca1f5..0b5e038fe 100644 --- a/hw/darwin/quartz/xpr/x-hook.h +++ b/hw/darwin/quartz/xpr/x-hook.h @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: $ */ #ifndef X_HOOK_H #define X_HOOK_H 1 diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index 859a5163d..17843362a 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-list.h" #include diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index a65cfcb7c..991e2b1f6 100644 --- a/hw/darwin/quartz/xpr/x-list.h +++ b/hw/darwin/quartz/xpr/x-list.h @@ -27,7 +27,7 @@ copyright 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/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_LIST_H #define X_LIST_H 1 diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h index 3d447b226..ab9b9fd42 100644 --- a/hw/darwin/quartz/xpr/xpr.h +++ b/hw/darwin/quartz/xpr/xpr.h @@ -26,6 +26,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. */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.1.4.1.4.2 2004/03/04 20:16:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #ifndef XPR_H @@ -39,6 +40,7 @@ void AppleDRIExtensionInit(void); void xprAppleWMInit(void); Bool xprInit(ScreenPtr pScreen); Bool xprIsX11Window(void *nsWindow, int windowNumber); +void xprHideWindows(Bool hide); Bool QuartzInitCursor(ScreenPtr pScreen); void QuartzSuspendXCursor(ScreenPtr pScreen); diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index eca0de334..a5186d5f6 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -27,7 +27,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/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "xpr.h" #include "applewmExt.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index a3dea69e2..ee06043df 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/darwin/quartz/xpr/xprCursor.c @@ -30,7 +30,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/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "quartzCommon.h" #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index ae24bc42a..0bf104a09 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,10 +27,11 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.1.4.1.4.2 2004/03/04 20:16:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" -#include "rootless.h" +#include "rootlessCommon.h" #include "Xplugin.h" #include "x-hash.h" #include "x-list.h" @@ -437,3 +438,45 @@ xprIsX11Window(void *nsWindow, int windowNumber) return ret; } + + +/* + * xprHideWindows + * Hide or unhide all top level windows. This is called for application hide/ + * unhide events if the window manager is not Apple-WM aware. Xplugin windows + * do not hide or unhide themselves. + */ +void +xprHideWindows(Bool hide) +{ + int screen; + WindowPtr pRoot, pWin; + + for (screen = 0; screen < screenInfo.numScreens; screen++) { + pRoot = WindowTable[screenInfo.screens[screen]->myNum]; + RootlessFrameID prevWid = NULL; + + for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) { + RootlessWindowRec *winRec = WINREC(pWin); + + if (winRec != NULL) { + if (hide) { + xprUnmapFrame(winRec->wid); + } else { + BoxRec box; + + xprRestackFrame(winRec->wid, prevWid); + prevWid = winRec->wid; + + box.x1 = 0; + box.y1 = 0; + box.x2 = winRec->width; + box.y2 = winRec->height; + + xprDamageRects(winRec->wid, 1, &box, 0, 0); + RootlessQueueRedisplay(screenInfo.screens[screen]); + } + } + } + } +} diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index 8090a27b1..3adb62a63 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.1.4.2.4.2 2004/03/04 17:47:30 eich Exp $ */ /* * Xplugin rootless implementation screen functions */ @@ -358,6 +359,7 @@ static QuartzModeProcsRec xprModeProcs = { NULL, // No capture or release in rootless mode NULL, xprIsX11Window, + xprHideWindows, RootlessFrameForWindow, TopLevelParent, DRICreateSurface, diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt index 94d61b1f0..fb6d4399e 100644 --- a/hw/darwin/utils/README.txt +++ b/hw/darwin/utils/README.txt @@ -108,4 +108,4 @@ of the NeXT .keymapping file. -$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.1 2000/12/01 19:47:39 dawes Exp $ diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c index a264cbc10..8f3340b15 100644 --- a/hw/darwin/utils/dumpkeymap.c +++ b/hw/darwin/utils/dumpkeymap.c @@ -1,4 +1,4 @@ -// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $ +// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $ //============================================================================= // // Copyright (C) 1999,2000 by Eric Sunshine diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man index 2ad6d54d2..12983bada 100644 --- a/hw/darwin/utils/dumpkeymap.man +++ b/hw/darwin/utils/dumpkeymap.man @@ -30,7 +30,7 @@ // //============================================================================= // -// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $ +// $XFree86$ // .. .ig diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 345526d19..fdece85d7 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.10 2003/11/16 03:16:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ #include "X11/X.h" #define NEED_EVENTS diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 3332335df..b0418508c 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.26 2003/11/16 03:16:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ #if defined(WIN32) #include diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/Xvfb.man.pre index e3e255298..dd03a3a4b 100644 --- a/hw/vfb/Xvfb.man.pre +++ b/hw/vfb/Xvfb.man.pre @@ -1,3 +1,4 @@ +.\" $XdotOrg: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.1.4.2.4.1 2004/03/04 17:47:33 eich Exp $ .\" $Xorg: Xvfb.man,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" @@ -49,7 +50,7 @@ that don't really need an X server but insist on having one anyway. .SH BUILDING To build \fIXvfb\fP, put the following in your host.def and remake. .PP -\&#define BuildServer YES /* if you aren't already building other servers */ +\&#define BuildServer YES /\(** if you aren't already building other servers */ .br \&#define XVirtualFramebufferServer YES diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index bf9fbeee2..f888eb0f6 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.104 2003/11/03 05:11:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.106 2004/02/02 03:55:28 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * @@ -58,6 +58,10 @@ # define _COMPILER_H +#if defined(__SUNPRO_C) +# define DO_PROTOTYPES +#endif + /* Allow drivers to use the GCC-supported __inline__ and/or __inline. */ # ifndef __inline__ # if defined(__GNUC__) @@ -112,6 +116,10 @@ extern int ffs(unsigned long); ; # endif +# if defined(__SUNPRO_C) +# define DO_PROTOTYPES +# endif + # if defined(NO_INLINE) || defined(DO_PROTOTYPES) # if !defined(__sparc__) && !defined(__arm32__) \ @@ -489,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11) # define outw(a,b) _outw(b,a) # define outl(a,b) _outl(b,a) -# elif defined(linux) && defined(__AMD64__) +# elif defined(linux) && defined(__amd64__) # include @@ -1296,6 +1304,7 @@ inl(unsigned short port) # define mem_barrier() /* NOP */ # define write_mem_barrier() /* NOP */ +# if !defined(__SUNPRO_C) # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) # ifdef GCCUSESGAS @@ -1441,6 +1450,7 @@ inl(unsigned short port) } # endif /* FAKEIT */ +# endif /* __SUNPRO_C */ # endif /* ix86 */ @@ -1537,7 +1547,7 @@ extern void outl(unsigned int a, unsigned int l); # include #endif # ifndef __HIGHC__ -# ifndef __USLC__ +# if !defined(__USLC__) && !defined(__SUNPRO_C) # define __USLC__ # endif # endif @@ -1556,13 +1566,14 @@ extern void outl(unsigned int a, unsigned int l); # include # endif /* IN_MODULE */ # endif /* USL */ -# ifndef sgi -# include +# if !defined(sgi) && !defined(__SUNPRO_C) +# include # endif # else # include "scoasm.h" # endif -# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) +# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) && \ + !defined(__SUNPRO_C) # pragma asm partial_optimization outl # pragma asm partial_optimization outw # pragma asm partial_optimization outb @@ -1613,7 +1624,17 @@ extern void outl(unsigned port, unsigned val); /* entry points for Mmio memory access routines */ extern int (*xf86ReadMmio8)(void *, unsigned long); extern int (*xf86ReadMmio16)(void *, unsigned long); +# ifndef STANDALONE_MMIO extern int (*xf86ReadMmio32)(void *, unsigned long); +# else +/* Some DRI 3D drivers need MMIO_IN32. */ +static __inline__ int +xf86ReadMmio32(void *Base, unsigned long Offset) +{ + __asm__ __volatile__("mb" : : : "memory"); + return *(volatile CARD32*)((unsigned long)Base+(Offset)); +} +# endif extern void (*xf86WriteMmio8)(int, void *, unsigned long); extern void (*xf86WriteMmio16)(int, void *, unsigned long); extern void (*xf86WriteMmio32)(int, void *, unsigned long); @@ -1629,7 +1650,11 @@ extern void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); /* Changed to kill noise generated by gcc's -Wcast-align */ # define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset) # define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset) -# define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset) +# ifndef STANDALONE_MMIO +# define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset) +# else +# define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset) +# endif # if defined (JENSEN_SUPPORT) # define MMIO_OUT32(base, offset, val) \ diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes index f7dc01216..1d72861e4 100644 --- a/hw/xfree86/common/extramodes +++ b/hw/xfree86/common/extramodes @@ -1,7 +1,7 @@ // // Extra modes to include as default modes in the X server. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ // # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl index e31fe28e1..abe995550 100644 --- a/hw/xfree86/common/modeline2c.pl +++ b/hw/xfree86/common/modeline2c.pl @@ -34,7 +34,7 @@ # the sale, use or other dealings in this Software without prior written # authorization from the copyright holder(s) and author(s). # -# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $ #my %flagshash; $flagshash{""} = "0"; diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes index d2df5931a..851643fa6 100644 --- a/hw/xfree86/common/vesamodes +++ b/hw/xfree86/common/vesamodes @@ -3,7 +3,7 @@ // "VESA and Industry Standards and Guide for Computer Display Monitor // Timing", version 1.0, revision 0.8, adopted September 17, 1998. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $ # 640x350 @ 85Hz (VESA) hsync: 37.9kHz diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index e189e81d2..313d43015 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.172 2003/09/24 02:43:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.173 2004/01/27 01:31:44 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -57,7 +57,6 @@ extern int xf86PixmapIndex; extern Bool xf86ResAccessEnter; extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ extern const unsigned char byte_reversed[256]; -extern PropertyPtr *xf86RegisteredPropertiesTable; extern ScrnInfoPtr xf86CurrentScreen; extern Bool pciSlotClaimed; extern Bool isaSlotClaimed; diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 2ffbfa964..5e002c8db 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.79 2003/11/03 05:11:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.80 2004/02/05 18:24:59 eich Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -525,14 +525,14 @@ disableAccess(void) for (i = 0; i < xf86NumScreens; i++) { peacc = xf86Screens[i]->CurrentAccess->pIoAccess; while (peacc) { - if (peacc->pAccess->AccessDisable) + if (peacc->pAccess && peacc->pAccess->AccessDisable) peacc->pAccess->AccessDisable(peacc->pAccess->arg); peacc = peacc->next; } xf86Screens[i]->CurrentAccess->pIoAccess = NULL; peacc = xf86Screens[i]->CurrentAccess->pMemAccess; while (peacc) { - if (peacc->pAccess->AccessDisable) + if (peacc->pAccess && peacc->pAccess->AccessDisable) peacc->pAccess->AccessDisable(peacc->pAccess->arg); peacc = peacc->next; } diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 8f6dd2803..57a122cd9 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.4.2.3 2004/03/04 20:16:17 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 3dde4ba7d..ada769d8c 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 1.1.4.1.6.2 2004/03/04 17:47:34 eich Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * @@ -632,8 +633,8 @@ configureModuleSection (void) /* Add only those font backends which are referenced by fontpath */ /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */ if (defaultFontPath && ( - (strcmp(*el, "xtt") == 0 && - strstr(defaultFontPath, "/TrueType")) || + (strcmp(*el, "freetype") == 0 && + strstr(defaultFontPath, "/TTF")) || (strcmp(*el, "type1") == 0 && strstr(defaultFontPath, "/Type1")) || (strcmp(*el, "speedo") == 0 && diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 5e4bc29b6..ac57935e0 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.3.2.3 2004/03/04 20:16:18 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 754e20d18..7d37ac7ef 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.52 2003/11/21 06:01:44 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.1.4.3 2003/12/20 00:28:26 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. * @@ -28,6 +29,6 @@ #ifndef XF86_DATE -#define XF86_DATE "20 November 2003" +#define XF86_DATE "18 December 2003" #endif diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 7257b204b..1d6d332ec 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */ +/* $XFree86$ */ /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at * modeline2c.pl */ diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 1c3f3a34f..791fd2673 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.158 2003/11/03 05:11:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.159 2003/11/22 04:22:11 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * @@ -49,6 +49,7 @@ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.1.4.3 2003/12/06 13:24:24 kaleb Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -347,7 +348,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) } break; #if !defined(__SOL8__) && !defined(__UNIXOS2__) && !defined(sgi) && \ - (!defined(sun) || defined(i386)) + (!defined(sun) || defined(i386)) && defined(VT_ACTIVATE) case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { int vtno = *((int *) arg); diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index c6dee3731..a2bb3f504 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.41 2003/08/24 17:36:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.42 2004/01/27 01:31:44 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -236,7 +236,7 @@ Bool xf86VidModeAllowNonLocal = FALSE; Bool xf86MiscModInDevDisabled = FALSE; Bool xf86MiscModInDevAllowNonLocal = FALSE; #endif -PropertyPtr *xf86RegisteredPropertiesTable = NULL; +RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; Bool xf86inSuspend = FALSE; #ifdef DLOPEN_HACK diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 713e7861a..076a97f16 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.135 2003/10/08 14:58:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.136 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -2888,11 +2888,12 @@ int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, int format, unsigned long len, pointer value ) { - PropertyPtr pNewProp, pRegProp; + RootWinPropPtr pNewProp = NULL, pRegProp; int i; + Bool existing = FALSE; #ifdef DEBUG - ErrorF("xf86RegisterRootWindowProperty(%d, %d, %d, %d, %d, %p)\n", + ErrorF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n", ScrnIndex, property, type, format, len, value); #endif @@ -2900,19 +2901,35 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, return(BadMatch); } - if ( (pNewProp = (PropertyPtr)xalloc(sizeof(PropertyRec)))==NULL ) { - return(BadAlloc); + if (xf86RegisteredPropertiesTable && + xf86RegisteredPropertiesTable[ScrnIndex]) { + for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex]; + pNewProp; pNewProp = pNewProp->next) { + if (strcmp(pNewProp->name, NameForAtom(property)) == 0) + break; + } } - pNewProp->propertyName = property; + if (!pNewProp) { + if ((pNewProp = (RootWinPropPtr)xalloc(sizeof(RootWinProp))) == NULL) { + return(BadAlloc); + } + /* + * We will put this property at the end of the list so that + * the changes are made in the order they were requested. + */ + pNewProp->next = NULL; + } else { + if (pNewProp->name) + xfree(pNewProp->name); + existing = TRUE; + } + + pNewProp->name = xnfstrdup(NameForAtom(property)); pNewProp->type = type; pNewProp->format = format; pNewProp->size = len; pNewProp->data = value; - /* We will put this property at the end of the list so that - * the changes are made in the order they were requested. - */ - pNewProp->next = NULL; #ifdef DEBUG ErrorF("new property filled\n"); @@ -2923,7 +2940,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, ErrorF("creating xf86RegisteredPropertiesTable[] size %d\n", xf86NumScreens); #endif - if ( NULL==(xf86RegisteredPropertiesTable=(PropertyPtr*)xnfcalloc(sizeof(PropertyPtr),xf86NumScreens) )) { + if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) { return(BadAlloc); } for (i=0; inext != NULL) { + if (!existing) { + if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) { + xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp; + } else { + pRegProp = xf86RegisteredPropertiesTable[ScrnIndex]; + while (pRegProp->next != NULL) { #ifdef DEBUG - ErrorF("- next %p\n", pRegProp); + ErrorF("- next %p\n", (void *)pRegProp); #endif - pRegProp = pRegProp->next; + pRegProp = pRegProp->next; + } + pRegProp->next = pNewProp; } - pRegProp->next = pNewProp; } #ifdef DEBUG ErrorF("xf86RegisterRootWindowProperty succeeded\n"); diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index ce8817096..979b655ee 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.211 2003/11/01 00:47:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -155,7 +155,7 @@ xf86CreateRootWindow(WindowPtr pWin) int ret = TRUE; int err = Success; ScreenPtr pScreen = pWin->drawable.pScreen; - PropertyPtr pRegProp, pOldRegProp; + RootWinPropPtr pProp; CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)(pScreen->devPrivates[xf86CreateRootWindowIndex].ptr); @@ -181,25 +181,19 @@ xf86CreateRootWindow(WindowPtr pWin) } /* Now do our stuff */ - if (xf86RegisteredPropertiesTable != NULL) { if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) { - for (pRegProp = xf86RegisteredPropertiesTable[pScreen->myNum]; - pRegProp != NULL && err==Success; - pRegProp = pRegProp->next ) + for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum]; + pProp != NULL && err==Success; + pProp = pProp->next ) { - Atom oldNameAtom = pRegProp->propertyName; - char *nameString; - /* propertyName was created before the screen existed, - * so the atom does not belong to any screen; - * we need to create a new atom with the same name. - */ - nameString = NameForAtom(oldNameAtom); - pRegProp->propertyName = MakeAtom(nameString, strlen(nameString), TRUE); + Atom prop; + + prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE); err = ChangeWindowProperty(pWin, - pRegProp->propertyName, pRegProp->type, - pRegProp->format, PropModeReplace, - pRegProp->size, pRegProp->data, + prop, pProp->type, + pProp->format, PropModeReplace, + pProp->size, pProp->data, FALSE ); } @@ -207,14 +201,6 @@ xf86CreateRootWindow(WindowPtr pWin) /* Look at err */ ret &= (err==Success); - /* free memory */ - pOldRegProp = xf86RegisteredPropertiesTable[pScreen->myNum]; - while (pOldRegProp!=NULL) { - pRegProp = pOldRegProp->next; - xfree(pOldRegProp); - pOldRegProp = pRegProp; - } - xf86RegisteredPropertiesTable[pScreen->myNum] = NULL; } else { xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with " "non-root window %p (parent %p)\n", @@ -303,7 +289,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) xf86ScreenIndex = AllocateScreenPrivateIndex(); xf86CreateRootWindowIndex = AllocateScreenPrivateIndex(); xf86PixmapIndex = AllocatePixmapPrivateIndex(); - xf86RegisteredPropertiesTable=NULL; generation = serverGeneration; } @@ -749,6 +734,32 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) } formatsDone = TRUE; + if (xf86Info.vtno >= 0 ) { +#define VT_ATOM_NAME "XFree86_VT" + Atom VTAtom=-1; + CARD32 *VT = NULL; + int ret; + + /* This memory needs to stay available until the screen has been + initialized, and we can create the property for real. + */ + if ( (VT = xalloc(sizeof(CARD32)))==NULL ) { + FatalError("Unable to make VT property - out of memory. Exiting...\n"); + } + *VT = xf86Info.vtno; + + VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME), TRUE); + + for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) { + ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex, + VTAtom, XA_INTEGER, 32, + 1, VT ); + if (ret != Success) + xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING, + "Failed to register VT property\n"); + } + } + /* If a screen uses depth 24, show what the pixmap format is */ for (i = 0; i < xf86NumScreens; i++) { if (xf86Screens[i]->depth == 24) { diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index fbbafd8af..3b7551fc5 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index fd2ff4a22..ec83f514b 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.3.2.1 2004/02/27 21:30:59 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index a46bfc39b..82df2aead 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.82 2003/09/09 03:20:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.83 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2002 by The XFree86 Project, Inc. @@ -113,6 +113,8 @@ extern int xf86LogVerbose; /* log file verbosity level */ extern Bool xf86ProbeOnly; extern Bool xf86DoProbe; +extern RootWinPropPtr *xf86RegisteredPropertiesTable; + #ifndef DEFAULT_VERBOSE #define DEFAULT_VERBOSE 0 #endif diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index 8b0a0f4ce..93d64fd51 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.40 2003/10/17 20:02:12 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.41 2004/01/27 01:31:45 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -198,6 +198,16 @@ typedef struct { } VidModeRec, *VidModePtr; #endif +/* Information for root window properties. */ +typedef struct _RootWinProp { + struct _RootWinProp * next; + char * name; + Atom type; + short format; + long size; + pointer data; +} RootWinProp, *RootWinPropPtr; + /* private resource types */ #define ResNoAvoid ResBios diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 546c909ff..6f7fac3d3 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,5 +1,6 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.3.2.2 2004/03/04 17:47:34 eich Exp $ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index 07253bace..a044230ed 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.563 2003/11/21 06:01:44 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.4 2003/12/20 00:28:26 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */ /* * Copyright (c) 1994-2003 by The XFree86 Project, Inc. @@ -32,7 +33,7 @@ #define XF86_VERSION_MAJOR 4 #define XF86_VERSION_MINOR 3 #define XF86_VERSION_PATCH 99 -#define XF86_VERSION_SNAP 16 +#define XF86_VERSION_SNAP 902 /* This has five arguments for compatibilty reasons */ #define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \ @@ -58,3 +59,4 @@ #endif /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.4 2003/12/20 00:28:26 kaleb Exp $ */ diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index f7cb065a4..c3b09e361 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.1.4.2 2004/02/16 20:19:59 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. @@ -26,7 +27,8 @@ * authorization from the copyright holder(s) and author(s). */ -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) +#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ + || (defined(sun) && defined(__SVR4)) #include #else #define _XOPEN_SOURCE /* to get prototype for pow on some systems */ diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 87042cb14..801f2bafe 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ #include #include diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 0816c63a1..81c1b84ac 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 90289057b..db19e1442 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -1979,10 +1979,10 @@ xf86XVCopyYUV12ToPacked( Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24); #else /* This assumes a little-endian framebuffer */ - Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0]; - Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | Y[1]; - Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | Y[2]; - Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | Y[3]; + Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0]; + Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1]; + Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2]; + Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3]; #endif Dst += 4; Y += 8; V += 4; U += 4; i -= 4; @@ -1993,7 +1993,7 @@ xf86XVCopyYUV12ToPacked( Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24); #else /* This assumes a little-endian framebuffer */ - Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0]; + Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0]; #endif Dst++; Y += 2; V++; U++; } diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index facc27842..33fedeb0f 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */ /* X Input Serial Buffer routines for use in any XInput driver that accesses diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 7b5e26a23..39ae2ee11 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */ +/* $XFree86$ */ #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/ddc/DDC.HOWTO b/hw/xfree86/ddc/DDC.HOWTO index 2f2c95b7f..833a7ab54 100644 --- a/hw/xfree86/ddc/DDC.HOWTO +++ b/hw/xfree86/ddc/DDC.HOWTO @@ -94,4 +94,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 666dfc632..9b68b81bb 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -3,7 +3,7 @@ * * Copyright 1999 by Andrew C Aitchison */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index a61940cfa..58616d308 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */ /* edid.c: retrieve EDID record from raw DDC1 data stream: data * is contained in an array of unsigned int each unsigned int diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 7a2f30cb4..ccf9d9280 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */ /* edid.h: defines to parse an EDID block * diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index c0092aed9..bf2509c95 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */ /* interpret_edid.c: interpret a primary EDID block * diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index acd931e70..ac479d326 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ #include "Xarch.h" #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 064533800..29f418398 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */ /* print_edid.c: print out all information retrieved from display device * diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index fbb540e1d..caea5caa1 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ #include "vdif.h" #include "misc.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 8d358613e..7a647031a 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 496f3573f..123bb492e 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */ /* xf86DDC.c * diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index b4252ef6b..ae2e26641 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */ /* xf86DDC.h * diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c index 9369db1f2..422da4820 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. diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index f9dcc8477..914678b71 100644 --- a/hw/xfree86/dixmods/dbemodule.c +++ b/hw/xfree86/dixmods/dbemodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */ #include "xf86Module.h" 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..a27fa5994 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 $ */ /* * diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index cc717c31b..71b54866d 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.2.2.2 2004/03/04 20:16:03 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 a20d5659e..74119e4a1 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: xc/programs/Xserver/Xext/xf86vmode.c,v 1.1.4.3.4.1 2004/03/04 17:47:20 eich 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 */ @@ -114,7 +115,6 @@ static DISPATCH_PROC(SProcXF86VidModeGetGammaRampSize); static unsigned char XF86VidModeReqCode = 0; #endif - /* The XF86VIDMODE_EVENTS code is far from complete */ #ifdef XF86VIDMODE_EVENTS 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/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index f449d55ec..eb8e54f26 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: diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index 60b6bcfa0..274e68b2e 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index acafc456d..bd1022193 100644 --- a/hw/xfree86/dixmods/recordmod.c +++ b/hw/xfree86/dixmods/recordmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index 44aef65ce..d24f8a823 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index 07283cdb7..65062108e 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. */ diff --git a/hw/xfree86/doc/README.DRI b/hw/xfree86/doc/README.DRI index e663f2928..e3daac059 100644 --- a/hw/xfree86/doc/README.DRI +++ b/hw/xfree86/doc/README.DRI @@ -1254,4 +1254,4 @@ demo programs is available from http://dri.sourceforge.net/res.phtml Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/README.fonts b/hw/xfree86/doc/README.fonts index 7563c1c56..ea9628a4b 100644 --- a/hw/xfree86/doc/README.fonts +++ b/hw/xfree86/doc/README.fonts @@ -269,8 +269,8 @@ structure should be as follows: CID/fonts.scale After creating this directory structure and copying the relevant files, you -should create a <`tt/fonts.scale/' file. This file has the same format as in -the case of (non-CID) scalable fonts, except that its first column contains +should create a `fonts.scale' file. This file has the same format as in the +case of (non-CID) scalable fonts, except that its first column contains PostScript font names with the extension `.cid' appended rather than actual filenames: @@ -987,23 +987,28 @@ earlier in this document. The `X-TrueType' backend is a backend based on version 1 of the FreeType library. X-TrueType doesn't use the `fontenc' layer for managing font encod- -ings, but instead uses its own database of encodings. Since the functionali- -ties for CJKV support introduced by X-TT have been merged into the new -FreeType backend, the X-TT backend will be removed from XFree86's tree near -the future. Therefore, the use of FreeType backend is preferred over the X- -TT backend. General information on X-TrueType may be found at ." +ings, but instead uses its own database of encodings. + +Since the functionalities for CJKV support introduced by X-TT have been +merged into the new FreeType backend, the X-TT backend will be removed from +XFree86's tree near the future. Therefore, the use of FreeType backend is +preferred over the X-TT backend. + +General information on X-TrueType may be found at the After X-TT Project page +. 4.2.3 Delayed glyph rasterisation -When loading a large character set, the old FreeType delayed glyph rasterisa- -tion until the time at which the glyph was first used. The new FreeType -(libfreetype-xtt2) has an improved `very lazy' metric calculation method to -speed up the process when loading TrueType or OpenType fonts. Although the -X-TT module also has this method, the "vl=y" TTCap option must be set if you -want to use it. This is the default method for FreeType when it loads multi- -byte fonts. Even if you use a unicode font which has tens of thousands of -glyphs, this delay will not be worrisome as long as you use the new FreeType -backend -- its `very lazy' method is super-fast. +When loading a proportional fonts which contain a huge number of glyphs, the +old FreeType delayed glyph rasterisation until the time at which the glyph +was first used. The new FreeType (libfreetype-xtt2) has an improved `very +lazy' metric calculation method to speed up the process when loading TrueType +or OpenType fonts. Although the X-TT module also has this method, the +"vl=y" TTCap option must be set if you want to use it. This is the default +method for FreeType when it loads multi-byte fonts. Even if you use a uni- +code font which has tens of thousands of glyphs, this delay will not be wor- +risome as long as you use the new FreeType backend -- its `very lazy' method +is super-fast. The maximum error of bitmap position using `very lazy' method is 1 pixel, and is the same as that of a character-cell spacing. When the X-TT backend is @@ -1176,7 +1181,7 @@ The IANA RFC documents, available from a number of sites throughout the world, often provide interesting information about character set issues; see for example RFC 373. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.22 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.26 2003/11/19 01:44:58 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/README.rapidaccess b/hw/xfree86/doc/README.rapidaccess index a78dfb9bc..d19eb81c6 100644 --- a/hw/xfree86/doc/README.rapidaccess +++ b/hw/xfree86/doc/README.rapidaccess @@ -45,4 +45,4 @@ Dennis Bj -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $ +$XFree86$ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG index 78f7f2e84..8c1954452 100644 --- a/hw/xfree86/doc/changelogs/CHANGELOG +++ b/hw/xfree86/doc/changelogs/CHANGELOG @@ -1,4 +1,456 @@ -XFree86 4.3.99.17 (xx November 2003) +XFree86 4.4.0 (29 February 2004) + 821. Fix Radeon secondary head register initialization (Hui Yu@ATI, + Benjamin Herrenschmidt). + 820. ati & atimisc module changes (Marc La France) + - Allow builds with ATIAvoidNonPCI && !ATIAvoidCPIO; + - Make handling of unknown Radeon's saner; + - Add private option to re-enable BIOS display switches; + - Deal with ati & atimisc module version skews; + - Fix private option handling; + 819. Fix rendition driver system lockup on changes to text mode + (Bugzilla #1204, Eric Wittry). + 818. Make the "fp=n" TTCap option behave the same with the FreeType backend + as with the X-TT backend (Bugzilla #1163, Chisato Yamauchi). + 817. Fix the disappearance of the RAW_ASCENT, RAW_DESCENT, RAW_PIXEL_SIZE, + and RAW_POINT_SIZE properties for the FreeType backend (Bugzilla #1163, + Chisato Yamauchi). + 816. Fix a FreeType backend problem with the font ascent/descent being + incorrect with some fonts (Bugzilla #1163, Chisato Yamauchi, reported by + Michael Lampe). + 815. Fix for detection of hardwired panel for the via driver (Bugzilla #813, + Luc Verhaegen, reported by Johannes Specht). + 814. Fix missing ';' in via_driver.c hidden by an empty macro (Bugzilla #813, + Luc Verhaegen). + 813. Add FT_Get_Postscript_Name() to the freetype2 export list for OS/2. + This is needed for the recent PostScript fontname property fix + (Bugzilla #1189, Frank Giessler). + 812. Fix MGA driver for big endian and EXTRADEBUG compilation (derived from + #6132, Rene Rebe). + 811. Turn off the GetDisplayInfo BIOS call by default and add an option + to turn it back on in the i810 driver. This fixes some lockup + problems found with some Dell BIOS' (Alan Hourihane, Alain Poirier). + 810. Fix compile issue in imstt driver (#6140, Rene Rebe) + 809. Only reset primary head of a Radeon (#6133, Rene Rebe). + 808. Fix big-endian typo in xf86CopyYUV12ToPacked (#6131, Rene Rebe). + 807. Fix neomagic white screen/lockup bug introduced in 4.3.99.15 (Bugzilla + #1179, #1157, David Dawes). + 806. Fixing DPMS: let modification of DPMS timeout take effect immeditately, + don't activate DPMS when disabled (Egbert Eich). + +XFree86 4.3.99.903 (15 February 2004) + 805. Resync the pci.ids data with pciids.sf.net (2004-02-15 snapshot). + 804. Improve X server performance on OS/2 when using TCP transport: + - Let the server set TCP_NODELAY, et al. + - Change the behavior of os2PseudoSelect() on sockets. + (Bugzilla #1175, Frank Giessler). + 803. X server on OS/2 doesn't respect AutoRepeat on/off unless XKB is disabled + (Bugzilla #1174, Frank Giessler). + 802. Licence update. + 801. Optimise SlowBcopy() for ia64 architecture (Marc La France). + 800. Simplify vgaHWSaveFonts() and vgaHWRestoreFonts() to fix hangs seen with + certain nVidia boards on ZX1-based systems (Marc La France). + 799. Some more font path checks. + 798. Don't define X_LOCALE on Panther (Etsushi Kato and Toshimitsu Tanaka). + 797. Fix GL_VERSION string for indirect rendering (Bugzilla #1147, DRI Project) + 796. Fix the 1024x576 modes in the via driver (Bugzilla #812, Luc Verhaegen, + reported by Julian Cable). + 795. Add uz_UZ locale (Bugzilla #1151, Mashrab Kuvatov). + 794. Fix font alias overrun. + 793. Fix for the way the FreeType backend sets the + _ADOBE_POSTSCRIPT_FONTNAME property for Type1 fonts (Bugzilla #1123, + David Dawes, based on Roland Mainz, reported by David Capshaw). + 792. Fix formatting of the XLookupString bytes that xev prints out (Bugzilla + #1153, Noah Levitt). + 791. Likely fix for FreeBSD 5.2 libGL build problem (David Dawes, reported by + Terry R. Friedrichsen). + 790. Fix typo in bsd_mouse.c (Tyler Retzlaff). + 789. Fix off-by-one errors in the emulation of an ix86's BT, BTS, BTR and BTC + instructions (Marc La France). + 788. Fixing segfaults that may happen in some corner cases on VT switch + and int10 initialization (Egbert Eich). + 787. Increase PCI I/O space size on Linux/PowerPC (Bugzilla #1143, + Paul Mackerras). + 786. Fix DRI cleanup at exit and re-enabling on reset for the via driver + (Bugzilla #998, Thomas Hellström). + 785. Fix Xv error propagation to the client for the via driver (Bugzilla #998, + Thomas Hellström). + 784. Fix a problem when utilizing DrawArrays when indirect rendering + (Bugzilla #1142, DRI Project). + 783. Xterm followup fix for Bugzilla #981 (Thomas Dickey). + 782. Fix EXT version of vertex arrays (DRI Project). + 781. Fix long-standing off-by-one bug in calculating dimensions of single + (private) back cliprect when the window is partially offscreen in + libdri.a (Keith Whitwell) + 780. Don't do the MGAISBUSY() loop in MGAStormSync() for Mystique cards + because this reportedly results in an infinite loop (Bugzila #85, + David Dawes, reported by Phil ??? and Stéphane VOLTZ). + 779. Make sure the r128 driver enables the hsync and vsync signals after + programming a video mode (Bugzilla #935, Kevin Martin). + 778. Fix Multitexture problems with vertex arrays and indirect rendering + (Bugzilla #1092, DRI Project). + 777. Fix SecondaryColor & FogColor when indirect rendering (Bugzilla #1091, + DRI Project). + 776. Fix build failures on Mac OS X 10.1.x (Torrey T. Lyons). + 775. Fix a timing problem in the nsc driver that prevents the display from + working in some cases (Bugzilla #840, Hansruedi Glauser, Alan Hourihane). + 774. Via driver workaround to handle setting WC for the video memory when + initially only part of it has WC set (Bugzilla #1010 Thomas Hellström). + 773. Fix the XAA clipping flags for the via driver, which fixes a line + drawing problem seen with OpenOffice Calc (Bugzilla #1026, + Thomas Hellström). + 772. HKSCS and GB18030 support for luit (Bugzilla #1048, Zarick Lau). + 771. Fix some remaining memory allocation related problems with the via + driver (Bugzilla #998, Thomas Hellström). + 770. Add a UseRpath build switch to allow the use of -rpath to be enabled + or disabled from the host.def file. Implemented for *BSD, Hurd, Linux. + The default settings remains as before (David Dawes). + 769. Add a root window property called XFree86_VT that holds the VT number + that the XFree86 server is running on (Andrew Aitcheson, suggested by + Samuel Thibault). + 768. Fix a problem where root window properties registered with + xf86RegisterRootWindowProperty() are not re-registered after server + regeneration (David Dawes, reported by Samuel Thibault). + 767. Fix xtest failures for the savage driver's zero width lines by + removing the TwoPointLine and using only the Bresenham version + (reported by Nicolas Joly). + 766. Fix refresh rate setting for 845G/856G systems that don't support the + Intel-specific refresh rate BIOS calls (Bugzilla #1106, David Dawes, + reported by Lucian Precup). + 765. Fixes/build updates for BSD/OS 5.1 and 4.3.1 (Bugzilla #1111, Kurt Lidl). + 764. Fix a problem in libXmu's FindChildren() that can cause a crash by + copying memory from outside the bounds of an array (Bugzilla #1109, + John Tillman). + 763. Add missing TimerCallback in trident_video.c to shutdown the video. + This could account for many peoples lockups with video on Trident chips. + Also, add a Wait for vsync when programming video modes to avoid lockups. + (Yukun Chen, Alan Hourihane). + 762. Fix a lockup problem on Trident Blade3D engines by permanently turning + on PCI Retry. Also sync the engine on CloseScreen and LeaveVT. + (Yukun Chen, Alan Hourihane). + 761. Fix getaddrinfo() return value check in SmsGenerateClientID() that was + causing a crash when the current hostname is unresolved, and returning + a NULL id otherwise (Bugzilla #1096, David Dawes). + 760. Support automatic configuration of the X server on OpenBSD with + wsmouse-supported mices. (Matthieu Herrb). + 759. Updates for XKB keyboard maps: + - Add Tibetan/Dzongkha keyboard layout (Bugzilla #1082, Gregory Mokhin). + - Add three new Internet/multimedia keyboard descriptions + (Bugzilla #1088, Radics Laszlo). + 758. Add overlooked SecondaryColor entries to AppleDRI indirect dispatch + table (Torrey T. Lyons). + 757. Allocate pBIOSInfo->UserSetting in the via driver, which fixes a crash + (James Harris). + 756. Fix Linux drm kernel modules to handle the nopage() prototype change in + Linux 2.6.1 (Michel Dänzer, from DRI CVS). + 755. Fix use of dynamic xcursors on OS/2 (Bugzilla #1087, Frank Giessler). + 754. Fix the fbdev driver so that it allows 24-bit pixel size, and disable + the RandR extension when rotation is enabled (Jonathan Thambidurai). + 753. Rendition driver fixes: + - Fix the mode size limits so that the set of modes that the driver + accepts isn't unnecessarily restricted. + - Fix color palette refreshing after VT switching. + - Fix a core dump at server exit with the hardware cursor was enabled. + - Add checking for supported depths. Without this the server could + crash if an unsupported depth was specified. + (Eric Wittry) + 752. Update XKB registry file rules/xfree86.xml (Sergey Oudaltsov). + 751. Fix some rules in en_US.UTF-8 Compose file (Bugzilla #1071, + Matthew Fischer). + 750. Add some content (supported hardware and driver options) to the tdfx(4) + man page (Bugzilla #1068, Nicolas Joly). + 749. Make '-pn' (partial network) the default for all X servers, and document + the '-nopn' option (David Dawes). + 748. Allow rstartd.real to be installed into a location other than LIBDIR + (#6034, Luke Mewburn). + 747. Allow xdm's chooser to be installed into a directory other than LIBDIR + (#6033, Luke Mewburn). + 746. Add XKB description for the Logitech Access keyboard (#6026, + Michael Geddes). + 745. Fix typo in computing xterm's relative font size (Jess Thrysoee). + 744. Fix typo in savage man page (Bugzilla #1065, Nicolas Joly). + 743. Fix for xf86Msg() call with swapped arguments (Bugzilla #1064, + Nicolas Joly). + 742. Set the dependencies correctly for SCO shared libraries, and use gcc + for linking instead of ld (Bugzilla #1045, Kean Johnston). + 741. Some cleanups for the SCO support, and a few changes required for + compilation on UnixWare (Bugzilla #1045, Kean Johnston). + 740. Make the X server lock file code treat the display string in the same + way as the local listener code (i.e., convert it to an integer then back + to a string). This fixes a problem where an non-numeric display + argument could cause a second server to be started on display :0, + replacing the local listener nodes for the original server. + (Bugzilla #1056, David Dawes, reported by Robin Schoonover). + 739. Fix xfs and xdm core dumps in BecomeOrphan(), and rework/simplify + the BecomeDaemon() code (Bugzilla #1060, #1074, David Dawes, + reported by Martin Birgmeier). + 738. Add a "VBERestore" option for the i830 part of the i810 driver, to + allow the VBE restore bug workaround to be disabled. This is needed + for correct text mode restoration on some 830M-based machines + (David Dawes, reported by Martin van Es). + 737. Fix memory leak when list of registered renderers are cleared at the + start of each new server generation (Kevin Martin and Rik Faith). + 736. Fix memory double freeing at XIM destroying in imLcIm.c (Ivan Pascal, + reported: Bugzilla #1015). + 735. Add xkb keymap for Microsoft Mutimedia Keyboard keys (Bugzilla #1052, + Jacques Legare). + 734. Update Compose file for en_US.UTF-8 locale (Bugzilla #1053, + Matthew Fischer) and fix wrong comment signs there (Ivan Pascal). + 733. VIA driver fixes: + - Restructure the via driver's cache allocation to work with both + the VIA and new open DRI module, and remove the now unneeded + version check (Thomas Hellström, Alan Cox, bugzilla #998). + - Remove special case lindvd hack (Alan Cox) + - Add support for Xv when unaccelerated (Thomas Hellström) + (Bugzilla #998, #1020, #1021). + 732. Check for a NULL argument in XSetICFocus() before dereferencing it. + This fixes crashes with some XIM software (see + http://bugzilla.mozilla.gr.jp/show_bug.cgi?id=2961#c19). + 731. Improve the i810 bitblt bug workaround, and re-enable the pixmap cache + at depth 24 (David Dawes). + 730. Workaround for lockup at mode switch with an i810 (David Dawes). + 729. Fix transparent mono 8x8 pattern fills for the i810 (David Dawes). + 728. Disable XKB by default in XDarwin (Torrey T. Lyons). + 727. Fix manpage build warnings on Panther (Matthieu Herrb). + 726. Make sure that the ring buffer is flushed in I810CloseScreen(). This + fixes unpredictable behaviour that sometimes shows up after server + exit/restart or server reset, including memory corruption, spontaneous + reboots, etc, and some odd xtest behaviour (David Dawes). + 725. Xdmcp fixes for IPv6 and mixed IPv6/IPv4 operation. (Mario Klebsch, + Matthieu Herrb). + 724. Update rman by merging XFree86 changes to rman 3.2 (Thomas Dickey). + 723. Create fonts.scale and fonts.dir files in the target directories at + 'make install' time. This fixes several problems where some font + entries get left out (David Dawes). + 722. Add the Bitstream Vera fonts (Bitstream, Inc and The Gnome Project). + 721. Xterm patches #183, #184 (Thomas Dickey). + 720. Build fix for the Chips driver on Linux/arm (#6011, Michel Dänzer and + Othmar Pasteka). + 719. Change v4l "norm" names to the bttv versions (#5993, + Marco Antonio Alvarez). + 718. Fix for symbols/hr map (#5991, Vlatko Kosturjak). + 717. The current VIA DRI driver isn't remotely compatible with the current + code, so make sure it isn't loaded by requiring version 2.0.0 or later + (Alan Cox). + 716. Fix VIA KM400 memory detection (Luc Verhaegen, Bugzilla #813). + 715. Fix a long standing VIA Xv problem with totem/xine and YUV surface + types (Uberto Barbini). + 714. VIA driver updates/fixes: + - Remove HARDWARE_NEEDS_PROGRAMMED_ORIGIN (Bugzilla #1011). + - Allocate the UserSetting structure and use it. Changed the names so + its uses can be tracked through the tree (Bugzilla #1006, #1014). + - Remove dead FIFO handling code. + - Clean up formatting in via_bios.h, via_driver.h. + - via_tuner module (1/2 of Bugzilla #1012, #1013): + + Add via_tuner structures and methods. + + Handle the back end work for boards with Philips SAA71xx + devices on the I2C bus providing one or two TV overlays. + + Handle CXA2104S audio decoder if present. + + Handle FI1236 TV tuners if present. + - Remove bogus DriverVersion, DriverName stuff. + - Xv updates (Bugzilla #1013): + + Remove DDR mode tables and compute supported overlay modes properly. + + Remove various bits of dead code. + + Probe for Tuners in the Xv setup. + + Don't advertise XvImageMask on the tuner overlays - they can't do it. + + Clean up tuner channel computation. + + Make the property setting code use the via_tuner backend. + + Fix formatting of the various YUV copying loops. + (Alan Cox). + 713. Add a missing code for jisx0208.1990-0.enc (Chisato Yamauchi). + 712. Xtt2 update: Restore the behaviour of "bw" TTCap option for Netscape 4.x. + (Chisato Yamauchi). + 711. Fix neomagic driver default mode selection to match the detected + panel size. This allows it to work correctly with automatic + configuration (David Dawes). + 710. Fixes and updates for XKB keyboard maps: + - Fix Armenian phonetic keymap (Bugzilla #1016, Ani). + - Fix rules for Brasilian ABNT2 keyboard (Ricardo Y. Igarashi). + - Add Shift+CapsLock group switcher (Ivan Pascal, see Bugzilla #1025). + - Update rules/xfree86.lst with missing descriptions (Ivan Pascal). + 709. Build fix for Solaris Express (Bugzilla #1032, Alan Coopersmith). + 708. Fix warning in lib/Xt/Alloc.c (Bugzilla #1035, Nicolas Joly). + 707. Fix short overflow problem with box clipping in fb/fbcopy.c + (Bugzilla #978, Stephen McCamant). + 706. Fix logic in xterm's get_pty() for platforms where old-style pty's are + preferred to /dev/ptmx (Bugzilla #997, Kean Johnston, Thomas Dickey). + 705. Fix handling of eightBitInput for UTF-8 locales in xterm (Thomas Dickey). + 704. Merge recent cygwin-related changes from freedesktop.org's config/cf + (Thomas Dickey). + 703. Disable Xv in the via driver when acceleration is disabled (Alan Cox). + 702. Fix bugs caused by empty PCI buses on ZX1-based systems (Marc La France). + 701. Fix optional save/restore of BIOS area data in int10 module + (Marc La France). + 700. Update Swedish localization of XDarwin GUI (Patrik Montgomery). + 699. Fixes to build/run on cygwin (Thomas Dickey). This includes a workaround + for _XtInherit by Ralf Habacker, needed to run applications such as xman. + 698. Warning fixes for gcc 3.3.2 (Marc La France). + 697. Fix file descriptor leaks in xdm (Marc La France). + 696. Fix memory leaks in libFS (Marc La France). + 695. Security fix: change xdm to use mkstemp(), where available, instead of + mktemp() (Marc La France). + 694. Update XKB registry file rules/xfree86.xml (Sergey Oudaltsov). + 693. Fix for FreeType-related crash when attempting to draw a missing glyph + with constant-width fonts (Chisato Yamauchi). + +XFree86 4.3.99.902 (18 December 2003) + 672. Fixes for xterm (Thomas Dickey): + - Add a limit-check in selection to fix a bug in triple-clicking + (Bugzilla #981) + - add -v/-version/-h/-help options to uxterm (Debian #223926) + 671. Updates for SCO support (Bugzilla #994, Kean Johnston). + 670. Don't build the Aiptek driver unless HasLinuxInput is set + (Bugzilla #972, Andrew Aitchison). + 669. A new fixed version of the zh_CN.UTF-8 locale file (Bugzilla #991, + James Su). + 668. Fix locale.dir/locale.alias bugs that break the zh_CN.GB2312 locale + (Bugzilla #990, James Su). + 667. Fixes and updates for XKB keyboard maps: + - Add to 'us' keymap backslash key that can be rewritten in other layouts + (Bugzilla #976, Børre Gaup). + - Fix some keys in Georgian latin keymap (Bugzilla #985, Vano Beridze). + - Add Korean keymap (Jungshik Shin). + - Add French variant of 'dvorak' keymap (Josselin Mouette). + - Fix wrong key type in the 'keymap without special keys' (Ivan Pascal). + 666. Via driver updates: + - Fix pixmap caches and Xv. The blitter has a 2048 pixel limit so we + must constrain the pixmap cache. + - Rip out all the memory allocator garbage and put it in one place. + - Allow optional use of AlanH's new linear allocator (not yet heavily + tested). + - Fix allocation bugs that this clean up made visible. + - Add missing I2C symbols. + - Some small formatting/other cleanups. + (Alan Cox). + 665. Fix a problem with distinguishing unassigned characters in the FreeType + backend (Bugzilla #975, Roland Mainz, Chisato Yamauchi). + 664. Update Japanese localization of XDarwin GUI (Toshimitsu Tanaka). + 663. Fix setjmp-related build issues on Solaris 2.5.1/x86 (Lindsay Haigh). + 662. Xdm, xf86cfg, mkfontscale and fonttosfnt fixes for platforms without + snprintf() (Lindsay Haigh). + 661. Update Brazilian keyboard map (Ricardo Y. Igarashi). + 660. Fix a bug in the fbgc.c code that caused the even stipple code path to + be used instead of the odd stipple path. Basically causing glitches in + rendering or no rendering at all. (Alan Hourihane). + 659. Fix XDarwin crash in IOKit mode for certain screen resolutions + (Torrey T. Lyons). + 658. DRI update - update the SiS DRI driver from DRI trunk (Eric Anholt). + 657. Fix mouse wheel code again for PowerPC (#5990, Rene Rebe). + 656. Fix sparc asm glapi initialisation in libGL when using indirect rendering + (GLX) (Bugzilla #923, Ferris McCormick). + 655. Disable the OPTGX1SubsequentHorVertLine() function in the NSC Geode + GX1 driver to due problems falling back to the FillRectSolid function. + (Alan Hourihane, See Bugzilla #841 for reasons). + 654. Add sun.unicode.india-0.enc (Bugzilla #939, JungShik Shin, Roland Mainz). + 653. Fix an x86emu crash for a BIOS that references the FS (or GS) register + (Sergey Babkin). + 652. Install the DRM kernel module source under ProjectRoot/src (David Dawes). + 651. Update XKB registry file rules/xfree86.xml (Sergey Oudaltsov). + 650. Fix '-nolisten tcp' when building with IPv6 disabled (Bugzilla #651, + Andrew Bevitt). + 649. Add some missing dead-key compose sequences for Vietnamese (#5981, + Le Hong Boi). + 648. Fix a problem with the v4l driver not seeing all the tv-norms + available under the bttv driver with the Linux 2.6.0-test11 kernel + (#5976, Marco Antonio Alvarez). + 647. Build fix after recent REGION_* changes (Part of #5983, Oswald + Buddenhagen, and #5984, Alexander Stohr). + 646. Fix for XKB map 'altwin' to avoid one keysym to more than one modifier + mapping (Ivan Pascal). + +XFree86 4.3.99.901 ( 2 December 2003) + 645. Update xterm's checking of modifiers to match change 635, and handle + the case of keys like Meta_L being in more than one modifier. This + addresses an issue arising from Bugzilla #924 (David Dawes). + 644. When XDM-AUTHORIZATION-1 is used with IPv6 IPv4-mapped addresses, + (which should not happen with change 643, but can be done with other + xdm implementations) send the IPv4 address in the auth data; otherwise + send fake data for alignement purposes. (Matthieu Herrb). + 643. Don't generate XDM-AUTHORIZATION-1 authentification data for + IPv6 connections (Matthieu Herrb). + 642. Fix fontconfig timestamp checking problem that shows up on JFS + (Bugzilla #932, Frank Giessler). + 641. Restore VT ownership at XFree86 server exit on Linux. Should do the + same for other platforms that change change VT ownership at startup + (Bugzilla #927, Andrew Bevitt). + 640. Fix Mesa/GL problem on Linux with -mcpu=ultrasparc (reported by + Ferris McCormick). + 639. Fix a problem connecting to an IPv4-only X server running on a + machine which happens to have an AAAA DNS record from a NetBSD or + OpenBSD host with IPv6 configured (Matthieu Herrb). + 638. Don't use IPv6 sockets with IPv4-mapped addresses (::FFFF:w.x.y.z) + when making IPv4 connections with the "tcp" transport type. This + fixes problems on platforms (such as FreeBSD 5.1) which disable + IPv4-mapped addresses by default. It also fixes a problem with + XDM-AUTHORIZATION-1 for IPv4 connections with the default "tcp" + transport as reported in Bugzilla #903 (David Dawes). + 637. Fix backward compatibility of Xlib+IPv6 for apps linked against a libc + without IPv6 support (David Dawes). + 636. Restore the behaviour of scalable fonts.dir entries in directories with + the ":unscaled" attribute (Chisato Yamauchi, David Dawes, reported by + Mike Fabian). + 635. Fix xmodmap's output of the modifiers map when the first column keysym + is empty (Ivan Pascal). + 634. Fixes for XKB keyboard maps: + - fix Meta, Super, Hyper keysyms interpretation + - fix typo in rules/xfree86.xml (Ivan Pascal). + 633. DRI updates. + - Latest kernel drivers from the DRI trunk. + - Fix FB_LOCATION in radeon driver (Michel Daenzer). + - Texture managment code consolidation (Ian Romanick) + - i830 stencil fix (Keith Whitwell) + - mga blend fixes (Ville Syrjala) + 632. Fix a problem that prevented the i810 driver from using dot clocks less + than 12MHz (which appear to work) (Bugzilla #925, Richard Dengler). + 631. Fix a server crash that can happen when loading some CID fonts + (Bugzilla #906, David Dawes). + 630. Restructured version of the wacom driver, with support for TwinView, + fixed bugs and added filters (Bugzilla #537, Ping Cheng). + 629. Fix libfontenc link failure on OS/2 (Bugzilla #921, Frank Giessler). + 628. OS/2 fixes: + - Unable to connect to a font server. + - SIGFPE in GLX. + (Bugzila #920, Frank Giessler). + 627. Add a missing entry to big5hkscs-0.enc (Bugzilla #917, Jungshik Shin). + 626. Update libfreetype-xtt2 to version 1.1a: + - Fixed erroneous method of making up italic bitmap. + (Chisato Yamauchi, After X-TT Project). + 625. OS/2 build fixes: + - Cleanup of bootstrap leftovers in xc/config/imake. + - Explicitly define int32_t and int64_t in Mesa. + - Missing Xft/Imakefile patch. + (Bugzilla #915, Frank Giessler). + 624. Fix hide/unhide of XDarwin application with xpr when an AppleWM-aware + window manager is not present (Torrey T. Lyons). + 623. Fix generic rootless code bug which caused the wrong region to be + damaged on window resize (Torrey T. Lyons). + 622. Fix server crash when doing 'listwithinfo' of an outline font in + a directory marked ":unscaled" (Bugzilla #911, David Dawes). + 621. Fix a key truncation problem with 'xauth add' (Bugzilla #903, + David Dawes). + 620. With AppleDRI, don't use APPLE_fence as a replacement for NV_fence + calls (John Harper). + 619. Fix intermittent XDarwin crash when quitting (Torrey T. Lyons). + 618. Build fixes and updates for GNU/Hurd and GNU/K*BSD systems (Bugzilla + #907, #908, Robert Millan). + 617. Xterm fixes (Bugzilla #893, #905, Thomas Dickey). + 616. XDarwin fixes: + - Fix intermittent crash on XDarwin startup. + - Fix failure to redraw after resizing with cr implementation. + - Fix install failure when DESTDIR is specified (Reported by + Benjamin Reed). + (Torrey T. Lyons). + 615. Add command line options to mkfontscale to enable/disable generation + of iso10646-1 lines (Bugzilla #885, Roland Mainz). + 614. Add a more complete set of the encodings we support to mkfontscale + (Bugzilla #884, Roland Mainz). + 613. Add ansi-1251 encoding file (Bugzilla #884, Roland Mainz). + 612. Update XDMCP to use the IPv6 multicast address that has been assigned + by IANA. Draft XDMCP 1.1 specs updated accordingly (Bugzilla #895, + Alan Coopersmith). + 611. Add 'defined(VT_ACTIVATE)' to the test for platforms that support VT + switching (based on Bugzilla #894, Robert Millan). + 610. Make several tests for glibc features glibc-specific rather than + specific to the underlying OS (Bugzila #890, 891, Robert Millan). XFree86 4.3.99.16 (20 November 2003) 609. Fix 'constype' for modern framebuffers on Solaris (Bugzilla #890, @@ -461,7 +913,8 @@ XFree86 4.3.99.14 (10 October 2003) Frank Giessler). 458. Import Mesa 5.0.2 (Alan Hourihane). 457. DRI merge (DRI Project) - * details to follow.......... + - Update the SiS driver to use Mesa 5.0 + - 456. Fixes and updates for XKB keyboard maps: - Update xkb geometry files (Alexander Pohoyda). - Fix German-Romanian maps (Manfred Pohler). @@ -18230,7 +18683,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2982 2003/11/21 06:01:42 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3156 2004/02/29 04:25:24 martin Exp $ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG.ND b/hw/xfree86/doc/changelogs/CHANGELOG.ND index 3c9e1e1f6..5f0d87780 100644 --- a/hw/xfree86/doc/changelogs/CHANGELOG.ND +++ b/hw/xfree86/doc/changelogs/CHANGELOG.ND @@ -415,4 +415,4 @@ XFree86 3.9j (12 July 1997) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.2 1998/07/31 10:41:14 dawes Exp $ diff --git a/hw/xfree86/doc/devel/Domain.note b/hw/xfree86/doc/devel/Domain.note index 3db2aefae..ce0812b22 100644 --- a/hw/xfree86/doc/devel/Domain.note +++ b/hw/xfree86/doc/devel/Domain.note @@ -156,4 +156,4 @@ Most drivers currently used on ix86 need(ed) source code changes. multi-domain architectures, and support for Mach64 variants as non-primary heads is not yet available. -$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $ +$XFree86$ diff --git a/hw/xfree86/doc/devel/README.DRIcomp b/hw/xfree86/doc/devel/README.DRIcomp index 0f1bd1b69..7dab2b108 100644 --- a/hw/xfree86/doc/devel/README.DRIcomp +++ b/hw/xfree86/doc/devel/README.DRIcomp @@ -554,4 +554,4 @@ trouble shooting and how to use the DRI-enabled X server for 3D applications. Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry index 9c4111348..d76622157 100644 --- a/hw/xfree86/doc/devel/Registry +++ b/hw/xfree86/doc/devel/Registry @@ -407,4 +407,4 @@ and underscores removed. -$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $ diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml index 365acaf1a..0478a0598 100644 --- a/hw/xfree86/doc/sgml/DESIGN.sgml +++ b/hw/xfree86/doc/sgml/DESIGN.sgml @@ -25,9 +25,9 @@
-XFree86 X server ``New Design'' (DRAFT) +<title>XFree86 server 4.x Design (DRAFT) <author>The XFree86 Project, Inc -<date>Last modified 2003 January 22 +<date>19 December 2003 diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 409ada437..acef4c54b 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1191,8 +1191,8 @@ DRIGetDrawableInfo(ScreenPtr pScreen, if (x0 < 0) x0 = 0; if (y0 < 0) y0 = 0; - if (x1 > pScreen->width-1) x1 = pScreen->width-1; - if (y1 > pScreen->height-1) y1 = pScreen->height-1; + if (x1 > pScreen->width) x1 = pScreen->width; + if (y1 > pScreen->height) y1 = pScreen->height; pDRIPriv->private_buffer_rect.x1 = x0; pDRIPriv->private_buffer_rect.y1 = y0; 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..1a6a4c696 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/GL/dri/drimodule.c,v 1.1.4.1.4.2 2004/03/04 17:47:18 eich Exp $ */ /************************************************************************** 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: 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/dummylib/README b/hw/xfree86/dummylib/README index 8e5b539a6..4e270307a 100644 --- a/hw/xfree86/dummylib/README +++ b/hw/xfree86/dummylib/README @@ -4,4 +4,4 @@ There is one symbol per source/object so that each can be overriden individually by whatever uses this library. -$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $ +$XFree86$ diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index d8a0d285a..5835446bf 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifndef _DUMMY_LIB_H #define _DUMMY_LIB_H diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index 3c482b480..ec437d8df 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index a16126842..c1b0fa988 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 75634d7f3..6b910d5b3 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 4259f678e..d6e5c65a1 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index e36a590e7..30bc93e71 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 63d3ff8c7..4b7226e17 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index ea24fc1dc..006a6382a 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 1f61eda4d..f0cb2e127 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 5780d9c13..c6f8e523f 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index b7c0ddb53..f6164a8da 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 122f46d43..33f05ec9c 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 61c3e02a2..4ad5a1a51 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 51b785a73..50701741f 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index a4255698f..410d7b645 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index d7b95b430..d488d3615 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 2d36bea97..e002948a2 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index f460b6b9f..308f6230d 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index dd00635b0..b660d45b3 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 031b6e55a..8d9591442 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 8339c658b..2f959a95c 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 877bd6fd7..1f4614ba3 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 752cdb044..0345aa41f 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */ /* all driver need this */ #include "xf86.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc47f905..219ca07d3 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhw.man.pre b/hw/xfree86/fbdevhw/fbdevhw.man.pre index dadc1f9a3..e1ebe5c51 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.man.pre +++ b/hw/xfree86/fbdevhw/fbdevhw.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ .TH FBDEVHW __drivermansuffix__ __vendorversion__ .SH NAME fbdevhw \- os-specific submodule for framebuffer device access diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index b262be90f..dc1169362 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ #include "xf86.h" #include "xf86cmap.h" diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index d651e5129..f4017fb2a 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -2,7 +2,7 @@ * copyed from from linux kernel 2.2.4 * removed internal stuff (#ifdef __KERNEL__) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ #ifndef _LINUX_FB_H #define _LINUX_FB_H diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre index fcf1a6161..79db0b100 100644 --- a/hw/xfree86/getconfig/cfg.man.pre +++ b/hw/xfree86/getconfig/cfg.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ +.\" $XFree86$ .TH getconfig __filemansuffix__ __vendorversion__ .SH NAME getconfig - meta configuration files for getconfig(1) diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample index acf262d1a..62d06ad38 100644 --- a/hw/xfree86/getconfig/cfg.sample +++ b/hw/xfree86/getconfig/cfg.sample @@ -1,5 +1,5 @@ # $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/11/12 04:52:15 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $ # Some sample XFree86 getconfig rules file. diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre index 16c472fc5..6b43047c3 100644 --- a/hw/xfree86/getconfig/getconfig.man.pre +++ b/hw/xfree86/getconfig/getconfig.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ +.\" $XFree86$ .TH getconfig 1 __vendorversion__ .SH NAME getconfig - get configuration information for the XFree86 server diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index a7f5adf1a..55a6cb059 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -6,7 +6,7 @@ * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ #if 1 #include "misc.h" diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index e7423155a..b6ef41feb 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -2,7 +2,7 @@ * Copyright (C) 1998 Itai Nahshon, Michael Schimek */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c index de923b2f0..8f0c56f59 100644 --- a/hw/xfree86/i2c/xf86i2cmodule.c +++ b/hw/xfree86/i2c/xf86i2cmodule.c @@ -5,7 +5,7 @@ * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO index bba0c774f..e2154c1c3 100644 --- a/hw/xfree86/int10/INT10.HOWTO +++ b/hw/xfree86/int10/INT10.HOWTO @@ -341,4 +341,4 @@ XF86_AL,XF86_BL,XF86_CL,XF86_DL to access the lower byte of the AX,BX,CX and DX register. -$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $ diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 845c8a177..01bb4c30a 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 7528fea0e..76c2a1e3d 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -56,7 +56,7 @@ setup_int(xf86Int10InfoPtr pInt) X86_GS = 0; X86_EFLAGS = X86_IF_MASK | X86_IOPL_MASK; #if defined (_PC) - if (pInt->flags & SET_BIOS_SCRATCH) + if (pInt->Flags & SET_BIOS_SCRATCH) SetResetBIOSVars(pInt, TRUE); #endif return xf86BlockSIGIO(); @@ -76,7 +76,7 @@ finish_int(xf86Int10InfoPtr pInt, int sig) pInt->bp = (CARD32) X86_EBP; pInt->flags = (CARD32) X86_FLAGS; #if defined (_PC) - if (pInt->flags & RESTORE_BIOS_SCRATCH) + if (pInt->Flags & RESTORE_BIOS_SCRATCH) SetResetBIOSVars(pInt, FALSE); #endif } diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 6de89c5d9..c0433773d 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index debd842e7..7c95171d4 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.12 2002/04/04 14:05:51 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.11 2001/10/01 13:44:13 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index f6b38580c..c54de2461 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.4 2002/04/04 14:05:51 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.2 2000/02/12 03:39:57 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index a74bbeacd..e88c6500d 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.11 2003/03/21 22:26:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 843902c5e..c17e95d16 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c index 9e679ca6a..5857d23d2 100644 --- a/hw/xfree86/int10/xf86int10module.c +++ b/hw/xfree86/int10/xf86int10module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10module.c,v 1.2 2002/09/16 18:06:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 6998a0880..ffee4fb9a 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.13 2002/09/16 18:06:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index 67c37d5f4..27ff6fc14 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.2 2001/01/06 20:19:13 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.1 2000/01/23 04:44:35 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/loader/SparcMulDiv.S b/hw/xfree86/loader/SparcMulDiv.S index e7281593c..11139d192 100644 --- a/hw/xfree86/loader/SparcMulDiv.S +++ b/hw/xfree86/loader/SparcMulDiv.S @@ -22,7 +22,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/SparcMulDiv.S,v 1.1 2000/11/02 19:10:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SparcMulDiv.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ .globl urem_sparcv89, umul_sparcv89, udiv_sparcv89 .globl rem_sparcv89, mul_sparcv89, div_sparcv89 diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h index cd7807531..0fe454e97 100644 --- a/hw/xfree86/loader/aout.h +++ b/hw/xfree86/loader/aout.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.8 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.7 2002/05/31 18:46:00 dawes Exp $ */ /* * Borrowed from NetBSD's exec_aout.h diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index f77b3d73c..0a4877977 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.20 2003/10/15 17:46:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.19 2003/10/15 16:58:34 dawes Exp $ */ /* * diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h index b0e156319..7aeaf41fe 100644 --- a/hw/xfree86/loader/aoutloader.h +++ b/hw/xfree86/loader/aoutloader.h @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */ #ifndef _AOUTLOADER_H #define _AOUTLOADER_H diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h index 956b810a0..3129d1c72 100644 --- a/hw/xfree86/loader/ar.h +++ b/hw/xfree86/loader/ar.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */ #ifndef _AR_H #define _AR_H diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h index 52553278e..54a8cb57f 100644 --- a/hw/xfree86/loader/coff.h +++ b/hw/xfree86/loader/coff.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.6 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.5 1998/07/25 16:56:12 dawes Exp $ */ /* This file was implemented from the information in the book Understanding and Using COFF diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index b2fbfcf14..164c7d167 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.21 2003/10/15 17:40:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.21tsi Exp $ */ /* * @@ -133,7 +133,9 @@ static COFFCommonPtr COFFAddCOMMON(SYMENT *, int); static LOOKUP *COFFCreateCOMMON(COFFModulePtr); static COFFRelocPtr COFFDelayRelocation(COFFModulePtr, int, RELOC *); static SYMENT *COFFGetSymbol(COFFModulePtr, int); +#if defined(i386) || defined(__powerpc__) static unsigned char *COFFGetSymbolValue(COFFModulePtr, int); +#endif static COFFRelocPtr COFF_RelocateEntry(COFFModulePtr, int, RELOC *); static LOOKUP *COFF_GetSymbols(COFFModulePtr); static void COFFCollectSections(COFFModulePtr); @@ -298,6 +300,7 @@ COFFGetSymbol(COFFModulePtr file, int index) return (SYMENT *) (((unsigned char *)file->symtab) + (index * SYMESZ)); } +#if defined(i386) || defined(__powerpc__) static unsigned char * COFFGetSymbolValue(COFFModulePtr cofffile, int index) { @@ -323,6 +326,7 @@ COFFGetSymbolValue(COFFModulePtr cofffile, int index) xf86loaderfree(symname); return symval; } +#endif #if defined(__powerpc__) /* diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h index 217474671..3d6728481 100644 --- a/hw/xfree86/loader/coffloader.h +++ b/hw/xfree86/loader/coffloader.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ #ifndef _COFFLOADER_H #define _COFFLOADER_H diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 3808cf3e3..fda75b89d 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -1,4 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.61 2003/11/10 18:22:35 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.4.4.2 2004/03/04 17:48:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 + * 17:11:29 tsi Exp $ */ /* * Copyright 1995-1998 by Metro Link, Inc. @@ -114,6 +116,10 @@ LOOKUP dixLookupTab[] = { SYMFUNC(InitFocusClassDeviceStruct) SYMFUNC(InitLedFeedbackClassDeviceStruct) SYMFUNC(InitPtrFeedbackClassDeviceStruct) + SYMFUNC(InitKbdFeedbackClassDeviceStruct) + SYMFUNC(InitIntegerFeedbackClassDeviceStruct) + SYMFUNC(InitStringFeedbackClassDeviceStruct) + SYMFUNC(InitBellFeedbackClassDeviceStruct) SYMFUNC(InitValuatorClassDeviceStruct) SYMFUNC(InitKeyClassDeviceStruct) SYMFUNC(InitKeyboardDeviceStruct) @@ -201,7 +207,6 @@ LOOKUP dixLookupTab[] = { SYMVAR(DPMSEnabledSwitch) SYMVAR(DPMSDisabledSwitch) SYMVAR(defaultDPMSEnabled) - SYMVAR(currentRegionScreen) /* bigreq */ SYMVAR(maxBigRequestSize) #ifdef XV @@ -340,6 +345,7 @@ LOOKUP dixLookupTab[] = { SYMFUNC(TimerFree) SYMFUNC(TimerSet) SYMFUNC(TimerCancel) + SYMFUNC(SetDPMSTimers) /* io.c */ SYMFUNC(WriteToClient) SYMFUNC(SetCriticalOutputPending) diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index e9468e97b..51f0520e6 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */ #ifndef _DLLOADER_H #define _DLLOADER_H diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h index 91130e63d..a523eac84 100644 --- a/hw/xfree86/loader/elf.h +++ b/hw/xfree86/loader/elf.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.17 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.16 2003/06/12 14:12:34 eich Exp $ */ typedef unsigned int Elf32_Addr; typedef unsigned short Elf32_Half; diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index 5ab8af62d..d25ef44c6 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.62 2003/11/06 18:38:13 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */ /* * @@ -137,7 +137,7 @@ # if !defined(linux) # error No MAP_ANON? # endif -# if !defined (__AMD64__) || !defined(__linux__) +# if !defined (__amd64__) || !defined(__linux__) # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) # else # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT) @@ -155,7 +155,7 @@ #if defined (__alpha__) || \ defined (__ia64__) || \ - defined (__AMD64__) || \ + defined (__amd64__) || \ (defined (__sparc__) && \ (defined (__arch64__) || \ defined (__sparcv9))) @@ -247,7 +247,7 @@ typedef Elf32_Word Elf_Word; defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) typedef Elf_Rela Elf_Rel_t; #else typedef Elf_Rel Elf_Rel_t; @@ -441,7 +441,7 @@ ElfDelayRelocation(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel) defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) ELFDEBUG(", r_addend 0x%lx", rel->r_addend); # endif ELFDEBUG("\n"); @@ -476,7 +476,7 @@ ElfCOMMONSize(void) size += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -500,7 +500,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup) size += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -555,7 +555,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup) offset += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -921,7 +921,7 @@ ELFCreateGOT(ELFModulePtr elffile, int maxalign) ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n"); return FALSE; } -# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) +# if defined(linux) || defined(__OpenBSD__) { unsigned long page_size = getpagesize(); unsigned long round; @@ -1216,7 +1216,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, unsigned long *dest64; unsigned short *dest16; #endif -#if defined(__AMD64__) +#if defined(__amd64__) unsigned long *dest64; int *dest32s; #endif @@ -1234,7 +1234,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) ELFDEBUG("%lx", rel->r_addend); # endif ELFDEBUG("\n"); @@ -1293,7 +1293,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, break; #endif /* i386 */ -#if defined(__AMD64__) +#if defined(__amd64__) case R_X86_64_32: dest32 = (unsigned int *)(secp + rel->r_offset); # ifdef ELFDEBUG @@ -1350,7 +1350,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, ELFDEBUG("*dest64=%8.8lx\n", *dest64); # endif break; -#endif /* __AMD64__ */ +#endif /* __amd64__ */ #if defined(__alpha__) case R_ALPHA_NONE: case R_ALPHA_LITUSE: @@ -2760,10 +2760,16 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize, elffile->lsection[j].size = SecSize(i); elffile->lsection[j].flags = flags; switch (SecType(i)) { -#ifdef __OpenBSD__ +#if defined(linux) || defined(__OpenBSD__) case SHT_PROGBITS: - mprotect(elffile->lsection[j].saddr, SecSize(i), - PROT_READ | PROT_WRITE | PROT_EXEC); + { + unsigned long page_size = getpagesize(); + unsigned long round; + + round = (unsigned long)elffile->lsection[j].saddr & (page_size -1); + mprotect( (char *)elffile->lsection[j].saddr - round, + SecSize(i) + round, PROT_READ | PROT_WRITE | PROT_EXEC); + } break; #endif case SHT_SYMTAB: @@ -2958,7 +2964,7 @@ ELFLoadModule(loaderPtr modrec, int elffd, LOOKUP **ppLookup) ErrorF("Unable to allocate ELF sections\n"); return NULL; } -# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) +# if defined(linux) || defined(__OpenBSD__) { unsigned long page_size = getpagesize(); unsigned long round; diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h index e4693411b..0a42d7060 100644 --- a/hw/xfree86/loader/elfloader.h +++ b/hw/xfree86/loader/elfloader.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.4 2003/10/15 16:29:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */ #ifndef _ELFLOADER_H #define _ELFLOADER_H diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index 8da5089bc..bc51e2e0d 100644 --- a/hw/xfree86/loader/extsym.c +++ b/hw/xfree86/loader/extsym.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.1.4.3.2.1 2004/02/27 21:31:00 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */ /* diff --git a/hw/xfree86/loader/fontsym.c b/hw/xfree86/loader/fontsym.c index d91a2e216..1a1324fdb 100644 --- a/hw/xfree86/loader/fontsym.c +++ b/hw/xfree86/loader/fontsym.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.13 2003/10/15 16:29:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.14 2003/12/20 20:04:34 dawes Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * @@ -37,8 +37,10 @@ #include "fntfil.h" #include "fontutil.h" #include "fontxlfd.h" +#ifdef FONTCACHE #define _FONTCACHE_SERVER_ #include "fontcache.h" +#endif LOOKUP fontLookupTab[] = { @@ -89,6 +91,7 @@ LOOKUP fontLookupTab[] = { SYMFUNC(identifyEncodingFile) #endif +#ifdef FONTCACHE /* fontcache.c */ SYMFUNC(FontCacheGetSettings) SYMFUNC(FontCacheGetStatistics) @@ -99,6 +102,7 @@ LOOKUP fontLookupTab[] = { SYMFUNC(FontCacheGetEntry) SYMFUNC(FontCacheInsertEntry) SYMFUNC(FontCacheGetBitmap) +#endif {0, 0} }; diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index f8ddd45a4..f96bc55b2 100644 --- a/hw/xfree86/loader/hash.c +++ b/hw/xfree86/loader/hash.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.1.4.2.4.2 2004/03/04 20:16:43 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */ /* @@ -41,9 +42,7 @@ /* Prototypes for static functions. */ static unsigned int hashFunc(const char *); -static itemPtr LoaderHashFindNearest( - unsigned long - ); +static itemPtr LoaderHashFindNearest(unsigned long); static itemPtr LoaderhashTable[HASHSIZE]; diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h index 96cd41c02..88b525669 100644 --- a/hw/xfree86/loader/hash.h +++ b/hw/xfree86/loader/hash.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.3 1998/07/25 16:56:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ #ifndef _HASH_H #define _HASH_H diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 39ba510a1..efa60f20a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -61,7 +61,7 @@ #include <string.h> #if defined(linux) && \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || defined(__AMD64__)) + || defined(__amd64__)) #include <malloc.h> #endif #include <stdarg.h> @@ -368,7 +368,7 @@ LoaderInit(void) #if defined(linux) && \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || ( defined __AMD64__ && ! defined UseMMAP && ! defined DoMMAPedMerge)) + || ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge)) /* * The glibc malloc uses mmap for large allocations anyway. This breaks * some relocation types because the offset overflow. See loader.h for more @@ -487,7 +487,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label) if ((new_off_bias + size) > new_size) new_size += pagesize; ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE -# ifdef __AMD64__ +# ifdef __amd64__ | MAP_32BIT # endif , fd, new_off); @@ -496,7 +496,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label) return (void *)(ret + new_off_bias); # else ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE -# ifdef __AMD64__ +# ifdef __amd64__ | MAP_32BIT # endif , fd, offset + offsetbias); diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index c2bf47587..5f2e858e8 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.1.4.2.4.1 2004/02/27 21:31:00 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */ /* diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h index e937b9f08..0e18959c3 100644 --- a/hw/xfree86/loader/sym.h +++ b/hw/xfree86/loader/sym.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.7 2003/10/15 16:29:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.6 2000/10/24 00:06:55 anderson Exp $ */ /* * diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib index 27af6b3f2..43312e4e8 100644 --- a/hw/xfree86/os-support/README.OS-lib +++ b/hw/xfree86/os-support/README.OS-lib @@ -497,7 +497,7 @@ xf86cos(double x) -$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.10 2001/12/17 20:00:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.9 2001/07/23 13:15:48 dawes Exp $ diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index aa3313dc3..bab184e7c 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.5 2003/04/03 16:50:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.6 2003/12/30 15:18:30 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -117,11 +117,13 @@ has_bwx(void) #endif } #else /* __NetBSD__ */ +static unsigned long hae_thresh = (1UL << 24); +static unsigned long hae_mask = 0xf8000000UL; /* XXX - should use xf86AXP.c */ static struct alpha_bus_window *abw; static int abw_count = -1; static void -init_abw() +init_abw(void) { if (abw_count < 0) { abw_count = alpha_bus_getwindows(ALPHA_BUS_TYPE_PCI_MEM, &abw); @@ -142,7 +144,7 @@ has_bwx(void) } static unsigned long -dense_base() +dense_base(void) { if (abw_count < 0) init_abw(); @@ -154,7 +156,7 @@ dense_base() } static unsigned long -memory_base() +memory_base(void) { if (abw_count < 0) init_abw(); @@ -284,11 +286,13 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) xf86Msg(X_PROBED,"Machine needs sparse mapping\n"); pVidMem->mapMem = mapVidMemSparse; pVidMem->unmapMem = unmapVidMemSparse; +#ifndef __NetBSD__ if (axpSystem == -1) axpSystem = bsdGetAXP(); hae_thresh = xf86AXPParams[axpSystem].hae_thresh; hae_mask = xf86AXPParams[axpSystem].hae_mask; sparse_size = xf86AXPParams[axpSystem].size; +#endif /* __NetBSD__ */ } pVidMem->initialised = TRUE; } @@ -314,7 +318,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX); if (base == MAP_FAILED) { - FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n", + FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)\n", "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno)); } @@ -324,7 +328,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) /* else, mmap /dev/vga */ if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000) { - FatalError("%s: Address 0x%x outside allowable range\n", + FatalError("%s: Address 0x%lx outside allowable range\n", "xf86MapVidMem", Base); } base = mmap(0, Size, @@ -372,7 +376,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, if ((long)ptr == -1) { xf86Msg(X_WARNING, - "xf86ReadBIOS: %s mmap[s=%x,a=%x,o=%x] failed (%s)\n", + "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n", DEV_MEM, Len, Base, Offset, strerror(errno)); return(-1); } @@ -490,6 +494,7 @@ struct parms { u_int64_t hae; }; +#ifndef __NetBSD__ static int sethae(u_int64_t hae) { @@ -505,6 +510,7 @@ sethae(u_int64_t hae) return -1; #endif } +#endif /* __NetBSD__ */ static pointer mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags) @@ -553,7 +559,6 @@ readSparse8(pointer Base, register unsigned long Offset) { register unsigned long result, shift; register unsigned long msb; - mem_barrier(); Offset += (unsigned long)Base - (unsigned long)memBase; shift = (Offset & 0x3) << 3; @@ -561,11 +566,12 @@ readSparse8(pointer Base, register unsigned long Offset) msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } - result = *(vuip) ((unsigned long)memSBase + (Offset << 5)); result >>= shift; return 0xffUL & result; @@ -584,7 +590,9 @@ readSparse16(pointer Base, register unsigned long Offset) msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } @@ -612,7 +620,9 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset) msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } @@ -631,7 +641,9 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset) msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } @@ -659,7 +671,9 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset) msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } @@ -677,7 +691,9 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset) msb = Offset & hae_mask ; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 36943add1..cfea02602 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.2 2003/03/14 13:46:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.1tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 6c675b5da..9702ff0c7 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.9 2003/10/02 13:30:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index a47dc2384..c0a8f8890 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ +/* $XFree86$ */ /* * Slightly modified xf86KbdBSD.c which is diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index adb101dc5..ea3271629 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index 250e5cb55..6ed48d89b 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 91367078e..0f392a8a0 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.3 2003/10/07 22:33:37 herrb Exp $ */ +/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index ec95306e8..2952e9401 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index e4927d91a..c76c9f748 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.22 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 0f40ba707..d4689ce21 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 7f24124dc..93626b6f8 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -23,7 +23,7 @@ /* Modified for FreeBSD by David Dawes <dawes@XFree86.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ #include <sys/types.h> #include <unistd.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 0d586ef72..871bd2411 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -497,7 +497,7 @@ OpenKeyboard(InputInfoPtr pInfo) #endif default: xf86Msg(X_ERROR, "%s: Unsupported wskbd type \"%d\"", - pKbd->wsKbdType, pInfo->name); + pInfo->name, pKbd->wsKbdType); close(pInfo->fd); return FALSE; } diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h index c042d88bf..7b9cd434e 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.h +++ b/hw/xfree86/os-support/bsd/bsd_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ +/* $XFree86$ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index 74345654b..37139e8dd 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */ +/* $XFree86$ */ #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index 943bb9855..bb5936a1e 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.26 2003/10/10 20:56:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.28 2004/02/06 17:15:36 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. @@ -80,6 +80,16 @@ static const char *mouseDevs[] = { DEFAULT_PS2_DEV, NULL }; +#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +/* Only wsmouse mices are autoconfigured for now on OpenBSD */ +#define DEFAULT_WSMOUSE_DEV "/dev/wsmouse" +#define DEFAULT_WSMOUSE0_DEV "/dev/wsmouse0" + +static const char *mouseDevs[] = { + DEFAULT_WSMOUSE_DEV, + DEFAULT_WSMOUSE0_DEV, + NULL +}; #endif static int @@ -141,6 +151,8 @@ DefaultProtocol(void) { #if defined(__FreeBSD__) return "Auto"; +#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) + return "WSMouse"; #else return NULL; #endif @@ -195,7 +207,7 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) protoPara[0] = mode.syncmask[0]; protoPara[1] = mode.syncmask[1]; } - xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", + xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", pInfo->name, devproto[i].name); return devproto[i].name; } @@ -325,7 +337,50 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) } #endif -#if defined(WSCONS_SUPPORT) +#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) + +/* Only support wsmouse configuration for now */ +static const char * +SetupAuto(InputInfoPtr pInfo, int *protoPara) +{ + + xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", + pInfo->name, "wsmouse"); + return "wsmouse"; +} + +static void +SetMouseRes(InputInfoPtr pInfo, const char *protocol, int rate, int res) +{ + + xf86MsgVerb(X_INFO, 3, "%s: SetMouseRes: protocol %s rate %d res %d\n", + pInfo->name, protocol, rate, res); +} + +static const char * +FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) +{ + int fd = -1; + const char **pdev; + + for (pdev = mouseDevs; *pdev; pdev++) { + SYSCALL(fd = open(*pdev, O_RDWR | O_NONBLOCK)); + if (fd != -1) { + /* Set the Device option. */ + pInfo->conf_idev->commonOptions = + xf86AddNewOption(pInfo->conf_idev->commonOptions, + "Device", *pdev); + xf86Msg(X_INFO, "%s: found Device \"%s\"\n", + pInfo->name, *pdev); + close(fd); + break; + } + } + return *pdev; +} +#endif /* __OpenBSD__ && WSCONS_SUPPORT */ + +#ifdef WSCONS_SUPPORT #define NUMEVENTS 64 static void @@ -718,7 +773,11 @@ xf86OSMouseInit(int flags) p->SetBMRes = SetSysMouseRes; p->SetMiscRes = SetSysMouseRes; #endif -#if defined(__FreeBSD__) +#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) + p->SetupAuto = SetupAuto; + p->SetMiscRes = SetMouseRes; +#endif +#if defined(__FreeBSD__) || defined(__OpenBSD__) p->FindDevice = FindDevice; #endif p->PreInit = bsdMousePreInit; diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 75c8f8200..3c55ee72f 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.5 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.4 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index bb84e5566..3d88b075f 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index f75418964..a3bc237dc 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include <sys/types.h> diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index 8c1a8b8a2..8e1c802c9 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index 9338e61d4..eb51a2fcc 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include <ctype.h> #include <err.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usb.3 b/hw/xfree86/os-support/bsd/libusb/usb.3 index f88a28cd6..db0b1b08f 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.3 +++ b/hw/xfree86/os-support/bsd/libusb/usb.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.3,v 1.1 2000/02/11 18:06:50 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.3,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ .\" .Dd May 11, 1999 .Dt USB 3 diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h index 69ef79a62..445428118 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.h +++ b/hw/xfree86/os-support/bsd/libusb/usb.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ #define _DIAGASSERT(e) assert(e) diff --git a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages index 711ba206a..48c7b1351 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages +++ b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages @@ -9,7 +9,7 @@ # If the number is * then the line matches all usages and the name # is a printf formatting string that will be given the usage number. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb_hid_usages,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ # 1 Generic Desktop 0x00 Undefined diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h index cb0bf33ec..60883dd47 100644 --- a/hw/xfree86/os-support/bsd/libusb/usbvar.h +++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usbvar.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ struct report_desc { unsigned int size; diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 99be9ea2f..f1d22f4fa 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -3,7 +3,7 @@ * * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */ +/* $XFree86$ */ #ifndef _MEMRANGE_H #define _MEMRANGE_H diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 3e4ff9ee7..af2867f90 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.6 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index fe301acf5..760bf78b3 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.3 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index a0b639143..ab10485ee 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.81 2003/09/24 02:43:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.82 2004/01/16 15:39:04 tsi Exp $ */ /* * Pci.c - New server PCI access functions * @@ -1016,7 +1016,9 @@ xf86scanpci(int flags) if (!(devp->pci_bridge_control & PCI_PCI_BRIDGE_MASTER_ABORT_EN)) break; pciWriteByte(tag, PCI_PCI_BRIDGE_CONTROL_REG, - devp->pci_bridge_control & ~PCI_PCI_BRIDGE_MASTER_ABORT_EN); + devp->pci_bridge_control & + ~(PCI_PCI_BRIDGE_MASTER_ABORT_EN | + PCI_PCI_BRIDGE_SECONDARY_RESET)); break; default: @@ -1079,7 +1081,7 @@ xf86scanpci(int flags) if (!(devp->pci_bridge_control & PCI_PCI_BRIDGE_MASTER_ABORT_EN)) break; pciWriteByte(devp->tag, PCI_PCI_BRIDGE_CONTROL_REG, - devp->pci_bridge_control); + devp->pci_bridge_control & ~PCI_PCI_BRIDGE_SECONDARY_RESET); break; default: diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 74ca95baf..b0c767d5c 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.44 2003/11/07 23:57:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.45 2004/02/02 03:55:31 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -261,7 +261,7 @@ # define INCLUDE_XF86_NO_DOMAIN # endif # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper -#elif defined(__i386__) +#elif defined(__i386__) || defined(i386) # define ARCH_PCI_INIT ix86PciInit # define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_NO_DOMAIN @@ -327,7 +327,7 @@ # if !defined(__FreeBSD__) # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge # endif -#elif defined(__AMD64__) +#elif defined(__amd64__) # if defined(__FreeBSD__) # define ARCH_PCI_INIT freebsdPciInit # else diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 57262efa2..f81112474 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ #include <fcntl.h> #include <stdio.h> diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 04ff8b956..d218a0d2f 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index 06baa69ea..3b2bf5a9b 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.6 2003/10/02 13:30:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 76194802f..4846ee0ed 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.10 2002/11/17 18:42:01 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.9 2002/09/24 16:14:16 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 2aa98355b..7b00acb6b 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.9 2002/08/27 22:07:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.8 2002/07/24 19:06:52 tsi Exp $ */ /* * ppcPci.c - PowerPC PCI access functions * diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 1f5f03bd2..dbd17810f 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.6 2003/10/02 13:30:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ #ifndef _XF86_SBUS_H #define _XF86_SBUS_H diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c index b5a483560..5d4d6a991 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.c +++ b/hw/xfree86/os-support/bus/zx1PCI.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.5 2003/11/06 18:38:14 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.8 2004/01/16 15:39:38 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * @@ -97,9 +97,10 @@ #define LBA_PORT5_CNTRL 0x1228U #define LBA_PORT6_CNTRL 0x1230U #define LBA_PORT7_CNTRL 0x1238U -#define LBA_ROPE_RESET 0x01UL -#define LBA_CLEAR_ERROR 0x10UL -#define LBA_HARD_FAIL 0x40UL +#define LBA_RESET_FUNCTION 0x0000000001UL +#define LBA_CLEAR_ERROR 0x0000000010UL +#define LBA_HARD_FAIL 0x0000000040UL +#define LBA_RESET_COMPLETE 0x0100000000UL #define ROPE_PAGE_CONTROL 0x1418U @@ -117,8 +118,11 @@ #define IOA_SUBORDINATE_BUS 0x0059U #define IOA_CONTROL 0x0108U -#define IOA_FORWARD_VGA 0x08UL -#define IOA_HARD_FAIL 0x40UL +#define IOA_RESET_FUNCTION 0x0000000001UL +#define IOA_FORWARD_VGA 0x0000000008UL +#define IOA_CLEAR_ERROR 0x0000000010UL +#define IOA_HARD_FAIL 0x0000000040UL +#define IOA_RESET_COMPLETE 0x0100000000UL #define IOA_LMMIO_BASE 0x0200U #define IOA_LMMIO_MASK 0x0208U @@ -134,12 +138,33 @@ #define IOA_ELMMIO_MASK 0x0258U #define IOA_EIOS_BASE 0x0260U #define IOA_EIOS_MASK 0x0268U - +#define IOA_GLOBAL_MASK 0x0270U #define IOA_SLAVE_CONTROL 0x0278U #define IOA_VGA_PEER_ENABLE 0x2000UL #define IOA_MSI_BASE 0x0280U #define IOA_MSI_MASK 0x0288U +#define IOA_DMA_BASE 0x02B0U +#define IOA_DMA_MASK 0x02B8U + +#define IOA_ERROR_CONFIG 0x0680U +#define IOA_ERROR_PIOWRITE 0x0001UL +#define IOA_ERROR_PIOREAD 0x0002UL +#define IOA_ERROR_DMAWRITE 0x0004UL +#define IOA_ERROR_DMAREAD 0x0008UL +#define IOA_ERROR_CONFIG_MASTER 0x0010UL +#define IOA_ERROR_SMART 0x0020UL +#define IOA_ERROR_FATAL_SERR 0x0040UL +#define IOA_ERROR_ASSERT_SERR 0x0080UL +/* ? 0x0100UL */ +#define IOA_ERROR_LOOPBACK 0x0200UL +#define IOA_ERROR_CONFIG_TARGET 0x0400UL +#define IOA_ERROR_IO_MASTER 0x0800UL +#define IOA_ERROR_IO_TARGET 0x1000UL +#define IOA_ERROR_MEM_MASTER 0x2000UL +#define IOA_ERROR_MEM_TARGET 0x4000UL +#define IOA_ERROR_HF_IO_FATAL 0x8000UL + #define RANGE_ENABLE 0x01UL /* In various base registers */ #define IO_MASK ((1UL << 16) - 1UL) @@ -156,10 +181,15 @@ static CARD8 *pZX1mio = NULL, *pZX1ioa = NULL; -static INT8 zx1_ropemap[8]; /* One for each (potential) rope */ -static CARD64 zx1_lbacntl[8]; /* " " " " " */ +/* Per-rope data */ +static INT8 zx1_ropemap[8]; +static CARD32 zx1_pciids[8]; +static CARD64 zx1_lbacntl[8]; static int zx1_busno[8], zx1_subno[8]; +/* Array of Booleans for non-empty buses */ +static INT8 zx1_busnmpt[MAX_PCI_BUSES]; + static pciBusFuncs_t zx1BusFuncs; static int zx1_fakebus = -1; static Bool zx1_hasvga = FALSE; @@ -292,7 +322,8 @@ ControlZX1Bridge(int bus, CARD16 mask, CARD16 value) * SLAVE_CONTROL register. */ tmp1 = MIO_QUAD(VGA_ROUTE); - tmp2 = IOA_QUAD(ropenum, IOA_CONTROL); + tmp2 = IOA_QUAD(ropenum, IOA_CONTROL) & + ~(IOA_RESET_FUNCTION | IOA_CLEAR_ERROR); if ((tmp1 & VGA_ENABLE) && ((tmp1 & 0x07UL) == ropenum)) { current |= PCI_PCI_BRIDGE_VGA_EN; if ((mask & PCI_PCI_BRIDGE_VGA_EN) && @@ -315,8 +346,9 @@ ControlZX1Bridge(int bus, CARD16 mask, CARD16 value) MIO_QUAD(VGA_ROUTE) = 0UL; tmp3 = IOA_QUAD(tmp1 & 0x07UL, IOA_CONTROL); if (tmp3 & IOA_FORWARD_VGA) - IOA_QUAD(tmp1 & 0x07UL, IOA_CONTROL) = - tmp3 & ~IOA_FORWARD_VGA; + IOA_QUAD(tmp1 & 0x07UL, IOA_CONTROL) = tmp3 & + ~(IOA_RESET_FUNCTION | IOA_FORWARD_VGA | + IOA_CLEAR_ERROR); } if (!(tmp2 & IOA_FORWARD_VGA)) { tmp2 |= IOA_FORWARD_VGA; @@ -329,7 +361,7 @@ ControlZX1Bridge(int bus, CARD16 mask, CARD16 value) /* Move on to master abort failure enablement */ tmp1 = MIO_QUAD((ropenum << 3) + LBA_PORT0_CNTRL) & - ~(LBA_ROPE_RESET | LBA_CLEAR_ERROR); + ~(LBA_RESET_FUNCTION | LBA_CLEAR_ERROR); if ((tmp1 & LBA_HARD_FAIL) || (tmp2 & IOA_HARD_FAIL)) { current |= PCI_PCI_BRIDGE_MASTER_ABORT_EN; if ((mask & PCI_PCI_BRIDGE_MASTER_ABORT_EN) && @@ -445,13 +477,13 @@ xf86PreScanZX1(void) resRange range; unsigned long mapSize = xf86getpagesize(); unsigned long tmp, base, ioaaddr; - unsigned long flagsd = 0, based = 0, lastd = 0, maskd = 0, routed = 0; - unsigned long flags0 = 0, base0 = 0, last0 = 0, mask0 = 0, route0 = 0; - unsigned long flags1 = 0, base1 = 0, last1 = 0, mask1 = 0, route1 = 0; - unsigned long flags2 = 0, base2 = 0, last2 = 0, mask2 = 0, route2 = 0; - unsigned long flags3 = 0, base3 = 0, last3 = 0, mask3 = 0, route3 = 0; - unsigned long flagsg = 0, baseg = 0, lastg = 0, maskg = 0, routeg = 0; - unsigned long flagsl = 0, basel = 0, lastl = 0; + unsigned long flagsd, based, lastd, maskd, routed; + unsigned long flags0, base0, last0, mask0, route0; + unsigned long flags1, base1, last1, mask1, route1; + unsigned long flags2, base2, last2, mask2, route2; + unsigned long flags3, base3, last3, mask3, route3; + unsigned long flagsg, baseg, lastg, maskg, routeg; + unsigned long flagsl, basel, lastl; int i, rope; /* Map mio registers (minimum 8k) */ @@ -461,7 +493,7 @@ xf86PreScanZX1(void) if (!(pZX1mio = xf86MapVidMem(-1, VIDMEM_MMIO, MIO_BASE, mapSize))) return FALSE; - /* Look for ZX1's SBA and IOC */ + /* Look for ZX1's SBA and IOC */ /* XXX What about Dino? */ if ((MIO_LONG(MIO_FUNCTION0 + PCI_ID_REG) != DEVID(VENDOR_HP, CHIP_ZX1_SBA)) || (MIO_LONG(MIO_FUNCTION1 + PCI_ID_REG) != @@ -520,14 +552,14 @@ xf86PreScanZX1(void) /* Prevent hard-fails */ zx1_lbacntl[i] = MIO_QUAD((i << 3) + LBA_PORT0_CNTRL) & - ~(LBA_ROPE_RESET | LBA_CLEAR_ERROR); + ~(LBA_RESET_FUNCTION | LBA_CLEAR_ERROR); if (zx1_lbacntl[i] & LBA_HARD_FAIL) MIO_QUAD((i << 3) + LBA_PORT0_CNTRL) = zx1_lbacntl[i] & ~LBA_HARD_FAIL; /* Poke for an ioa */ - tmp = IOA_LONG(i, PCI_ID_REG); - switch ((CARD32)tmp) { + zx1_pciids[i] = IOA_LONG(i, PCI_ID_REG); + switch (zx1_pciids[i]) { case DEVID(VENDOR_HP, CHIP_ELROY): case DEVID(VENDOR_HP, CHIP_ZX1_LBA): /* Mercury */ case DEVID(VENDOR_HP, CHIP_ZX1_AGP8): /* QuickSilver */ @@ -539,10 +571,10 @@ xf86PreScanZX1(void) break; default: - if ((CARD16)(tmp + 1U) > (CARD16)1U) + if ((CARD16)(zx1_pciids[i] + 1U) > (CARD16)1U) xf86MsgVerb(X_NOTICE, 0, "HP ZX1: Unexpected vendor/device id 0x%08X" - " on rope %d\n", (CARD32)tmp, i); + " on rope %d\n", zx1_pciids[i], i); /* Nobody home, or not the "right" kind of rope guest */ /* @@ -589,6 +621,14 @@ xf86PreScanZX1(void) * ones. */ + flagsd = 0; based = 0; lastd = 0; maskd = 0; routed = 0; + flags0 = 0; base0 = 0; last0 = 0; mask0 = 0; route0 = 0; + flags1 = 0; base1 = 0; last1 = 0; mask1 = 0; route1 = 0; + flags2 = 0; base2 = 0; last2 = 0; mask2 = 0; route2 = 0; + flags3 = 0; base3 = 0; last3 = 0; mask3 = 0; route3 = 0; + flagsg = 0; baseg = 0; lastg = 0; maskg = 0; routeg = 0; + flagsl = 0; basel = 0; lastl = 0; + if ((tmp = MIO_QUAD(IOS_DIST_BASE)) & RANGE_ENABLE) { flagsd = RANGE_ENABLE; maskd = MIO_QUAD(IOS_DIST_MASK); @@ -898,6 +938,9 @@ xf86PostScanZX1(void) if (!pZX1mio) return; + (void)memset(zx1_busnmpt, FALSE, sizeof(zx1_busnmpt)); + pBusInfo = pciBusInfo[0]; + /* * Certain 2.4 & 2.5 Linux kernels add fake PCI devices. Remove them to * prevent any possible interference with our PCI validation. @@ -909,9 +952,11 @@ xf86PostScanZX1(void) ppPCI = ppPCI2 = xf86scanpci(0); /* Recursion is only apparent */ while ((pPCI = *ppPCI2++)) { switch (pPCI->pci_device_vendor) { - case DEVID(VENDOR_HP, CHIP_ZX1_SBA): - case DEVID(VENDOR_HP, CHIP_ZX1_IOC): - case DEVID(VENDOR_HP, CHIP_ZX1_LBA): + case DEVID(VENDOR_HP, CHIP_ELROY): + case DEVID(VENDOR_HP, CHIP_ZX1_SBA): /* Pluto function 0 */ + case DEVID(VENDOR_HP, CHIP_ZX1_IOC): /* Pluto function 1 */ + case DEVID(VENDOR_HP, CHIP_ZX1_LBA): /* Mercury */ + case DEVID(VENDOR_HP, CHIP_ZX1_AGP8): /* QuickSilver */ xfree(pPCI); /* Remove it */ continue; @@ -919,6 +964,8 @@ xf86PostScanZX1(void) *ppPCI++ = pPCI; idx++; + zx1_busnmpt[pPCI->busnum] = TRUE; + if (zx1_hasvga) continue; @@ -943,8 +990,8 @@ xf86PostScanZX1(void) } /* - * Restore hard-fail settings and figure out the actual subordinate bus - * numbers. + * Restore hard-fail settings and figure out the actual secondary and + * subordinate bus numbers. */ for (i = 0; i < 8; i++) { if (zx1_ropemap[i] != i) @@ -958,6 +1005,14 @@ xf86PostScanZX1(void) if (zx1_fakebus <= zx1_subno[i]) zx1_fakebus = zx1_subno[i] + 1; + + while (!zx1_busnmpt[zx1_busno[i]]) { + if (zx1_busno[i]) /* Info for bus zero is in static storage */ + xfree(pciBusInfo[zx1_busno[i]]); + pciBusInfo[zx1_busno[i]++] = NULL; + if (zx1_busno[i] > zx1_subno[i]) + break; + } } if (zx1_fakebus >= pciNumBuses) { @@ -967,13 +1022,13 @@ xf86PostScanZX1(void) } /* Set up our extra bus functions */ - zx1BusFuncs = *(pciBusInfo[0]->funcs); + zx1BusFuncs = *(pBusInfo->funcs); zx1BusFuncs.pciControlBridge = ControlZX1Bridge; zx1BusFuncs.pciGetBridgeResources = GetZX1BridgeResources; /* Set up our own fake bus to act as the root segment */ - zx1FakeBus.configMech = pciBusInfo[0]->configMech; - zx1FakeBus.numDevices = pciBusInfo[0]->numDevices; + zx1FakeBus.configMech = pBusInfo->configMech; + zx1FakeBus.numDevices = pBusInfo->numDevices; zx1FakeBus.primary_bus = zx1_fakebus; pciBusInfo[zx1_fakebus] = &zx1FakeBus; @@ -1008,7 +1063,8 @@ xf86PostScanZX1(void) /* Add a fake PCI-to-PCI bridge to represent each active rope */ for (i = 0; i < 8; i++) { - if ((zx1_ropemap[i] != i) || !(pBusInfo = pciBusInfo[zx1_busno[i]])) + if ((zx1_ropemap[i] != i) || (zx1_busno[i] > zx1_subno[i]) || + !(pBusInfo = pciBusInfo[zx1_busno[i]])) continue; if (++idx >= MAX_PCI_DEVICES) @@ -1018,7 +1074,7 @@ xf86PostScanZX1(void) pPCI->devnum = i | 0x10; /* pPCI->funcnum = 0; */ pPCI->tag = PCI_MAKE_TAG(zx1_fakebus, pPCI->devnum, 0); - pPCI->pci_device_vendor = DEVID(VENDOR_HP, CHIP_ZX1_LBA); + pPCI->pci_device_vendor = zx1_pciids[i]; pPCI->pci_base_class = PCI_CLASS_BRIDGE; pPCI->pci_sub_class = PCI_SUBCLASS_BRIDGE_PCI; pPCI->pci_header_type = 1; @@ -1034,6 +1090,9 @@ xf86PostScanZX1(void) /* Plug in chipset routines */ pBusInfo->funcs = &zx1BusFuncs; + /* Set bridge control register for scanpci utility */ + pPCI->pci_bridge_control = ControlZX1Bridge(zx1_busno[i], 0, 0); + #ifdef OLD_FORMAT xf86MsgVerb(X_INFO, 2, "PCI: BusID 0x%.2x,0x%02x,0x%1x " "ID 0x%04x,0x%04x Rev 0x%02x Class 0x%02x,0x%02x\n", diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c index 8be822445..8192e97eb 100644 --- a/hw/xfree86/os-support/drm/drmmodule.c +++ b/hw/xfree86/os-support/drm/drmmodule.c @@ -25,7 +25,7 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $ * */ diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 11fe19f67..984c79122 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.31 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */ /* * linux specific part of the int10 module - * Copyright 1999 Egbert Eich + * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich */ #include "xf86.h" #include "xf86_OSproc.h" @@ -212,7 +212,9 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) } else ((linuxInt10Priv*)pInt->private)->base_high = NULL; - MapCurrentInt10(pInt); + if (!MapCurrentInt10(pInt)) + goto error3; + Int10Current = pInt; #ifdef DEBUG @@ -387,7 +389,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) return pInt; error4: - xf86DrvMsg(screen, X_ERROR, "shmat() call retruned errno %d\n", errno); + xf86DrvMsg(screen, X_ERROR, "shmat() call returned errno %d\n", errno); error3: if (base_high) shmdt(base_high); diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index dc737ac47..e9cb6125a 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.3 2003/11/03 05:36:33 tsi Exp $ */ +/* $XFree86$ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index f2dd16267..b2adcd514 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h,v 3.3 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: Exp $ */ #ifndef LNX_H_ # ifdef __alpha__ diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 04e2f07c0..25ef8cc91 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -190,7 +190,8 @@ xf86AccResFromOS(resPtr ret) defined(__s390__) || \ defined(__hppa__) - /* XXX this isn't exactly correct but it will get the server working + /* + * XXX this isn't exactly correct but it will get the server working * for now until we get something better. */ @@ -203,7 +204,7 @@ xf86BusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -221,7 +222,7 @@ xf86PciBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -230,7 +231,7 @@ xf86PciBusAccWindowsFromOS(void) return ret; } -#ifdef INCLUDE_UNUSED */ +#ifdef INCLUDE_UNUSED resPtr xf86IsaBusAccWindowsFromOS(void) @@ -241,7 +242,7 @@ xf86IsaBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -267,7 +268,7 @@ xf86AccResFromOS(resPtr ret) ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 25639d72d..993679d81 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86$ */ /* * Slightly modified xf86KbdLnx.c which is diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index acac20bce..58f1062da 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -7,7 +7,7 @@ * Copyright © 2001 The XFree86 Project, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index f2f326959..1f9142a6b 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index 5813ef4e9..106aa2804 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ #include <stdio.h> #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index bfcb0d70f..8381fec27 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 0ac8c6a8b..5564f5ab9 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.1.4.2.4.2 2004/03/04 20:16:46 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> @@ -7,19 +8,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Orest Zborowski and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Orest Zborowski and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Orest Zborowski - * and David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * and David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD + * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, 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. * */ @@ -35,6 +36,8 @@ #include "xf86_OSlib.h" #include "lnx.h" +#include <sys/stat.h> + #ifdef USE_DEV_FB extern char *getenv(const char *); #include <linux/fb.h> @@ -45,13 +48,44 @@ static Bool KeepTty = FALSE; static int VTnum = -1; static int activeVT = -1; +static int vtPermSave[4]; +static char vtname[11]; + +static int +saveVtPerms(void) +{ + /* We need to use stat to get permissions. */ + struct stat svtp; + + /* Do them numerically ordered, hard coded tty0 first. */ + if (stat("/dev/tty0", &svtp) != 0) + return 0; + vtPermSave[0] = (int)svtp.st_uid; + vtPermSave[1] = (int)svtp.st_gid; + + /* Now check the console we are dealing with. */ + if (stat(vtname, &svtp) != 0) + return 0; + vtPermSave[2] = (int)svtp.st_uid; + vtPermSave[3] = (int)svtp.st_gid; + + return 1; +} + +static void +restoreVtPerms(void) +{ + /* Set the terminal permissions back to before we started. */ + chown("/dev/tty0", vtPermSave[0], vtPermSave[1]); + chown(vtname, vtPermSave[2], vtPermSave[3]); +} + void xf86OpenConsole(void) { int i, fd = -1; int result; struct vt_mode VT; - char vtname[11]; struct vt_stat vts; MessageType from = X_PROBED; #ifdef USE_DEV_FB @@ -61,7 +95,7 @@ xf86OpenConsole(void) char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; - if (serverGeneration == 1) + if (serverGeneration == 1) { /* check if we're run with euid==0 */ if (geteuid() != 0) @@ -124,6 +158,15 @@ xf86OpenConsole(void) xf86Info.vtno, strerror(errno)); } + /* + * Grab the vt ownership before we overwrite it. + * Hard coded /dev/tty0 into this function as well for below. + */ + if (!saveVtPerms()){ + xf86Msg(X_WARNING, + "xf86OpenConsole: Could not save ownership of VT\n"); + } + /* change ownership of the vt */ chown(vtname, getuid(), getgid()); @@ -171,7 +214,7 @@ xf86OpenConsole(void) xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n"); } SYSCALL(result = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT)); - if (result < 0) + if (result < 0) { FatalError("xf86OpenConsole: VT_GETMODE failed\n"); } @@ -181,7 +224,7 @@ xf86OpenConsole(void) VT.mode = VT_PROCESS; VT.relsig = SIGUSR1; VT.acqsig = SIGUSR1; - if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0) + if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0) { FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n"); } @@ -202,7 +245,7 @@ xf86OpenConsole(void) close(fbfd); #endif } - else + else { /* serverGeneration != 1 */ /* @@ -247,6 +290,9 @@ xf86CloseConsole() activeVT = -1; } close(xf86Info.consoleFd); /* make the vt-manager happy */ + + restoreVtPerms(); /* restore the permissions */ + return; } @@ -254,7 +300,7 @@ int xf86ProcessArgument(int argc, char *argv[], int i) { /* - * Keep server from detaching from controlling tty. This is useful + * Keep server from detaching from controlling tty. This is useful * when debugging (so the server can receive keyboard signals. */ if (!strcmp(argv[i], "-keeptty")) diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 7631a1ff0..89afc8d64 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.26 2003/11/17 22:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 1.1.4.2.6.2 2004/03/04 17:48:09 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -90,10 +91,9 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* don't change, just test */ kbdrep_s.rate = -1; kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { return 0; } - /* do the change */ if (rate == 0) /* switch repeat off */ kbdrep_s.rate = 0; @@ -105,7 +105,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -130,8 +130,9 @@ KIOCSRATE_ioctl_ok(int rate, int delay) { if (kbdrate_s.rate > 50) kbdrate_s.rate = 50; - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) - return 0; + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + return 0; + } close( fd ); @@ -173,7 +174,6 @@ void xf86SetKbdRepeat(char rad) if (xf86Info.kbdDelay >= 0) delay = xf86Info.kbdDelay; - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ return; diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 2423bd45e..90a8bc106 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,7 +23,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index ba18f28a1..ab75fce09 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.5 2003/11/04 03:14:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.1.4.1.6.2 2004/03/04 17:48:09 eich Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. @@ -117,7 +118,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* don't change, just test */ kbdrep_s.rate = -1; kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -132,8 +133,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) { if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { - return 0; + if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { + return 0; } return 1; /* success! */ @@ -157,8 +158,9 @@ KIOCSRATE_ioctl_ok(int rate, int delay) { if (kbdrate_s.rate > 50) kbdrate_s.rate = 50; - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) - return 0; + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + return 0; + } close( fd ); diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h index ac783bfbc..7b9cd434e 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.h +++ b/hw/xfree86/os-support/linux/lnx_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86$ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 0cb69b209..cf18bcab6 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 5477b9130..41f76fd16 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ #include <stdio.h> #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index ad3a17fa2..5144cdf3e 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.68 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 8565dcc5c..1787a7c8c 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -22,7 +22,7 @@ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index e61ce76b7..3ace8f447 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index dcf734965..fd45ba4ec 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 858b0eb65..7d6bedec9 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c index e587b7ee0..12fa3bcae 100644 --- a/hw/xfree86/os-support/lynxos/lynx_ppc.c +++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index c667994b3..297d93bdf 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.18 2002/12/14 04:41:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.S b/hw/xfree86/os-support/misc/BUSmemcpy.S index e4ff36c62..83dab6f67 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.S +++ b/hw/xfree86/os-support/misc/BUSmemcpy.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */ /****************************************************************************** Copyright 1993 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index acef268a1..27d53fa8f 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -12,7 +12,7 @@ Thanks to Linus Torvalds for contributing this code. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index b5de1d899..ce99e792a 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ #ifdef __UNIXOS2__ #define I_NEED_OS2_H diff --git a/hw/xfree86/os-support/misc/IODelay.S b/hw/xfree86/os-support/misc/IODelay.S index 4c6e32f3f..685584653 100644 --- a/hw/xfree86/os-support/misc/IODelay.S +++ b/hw/xfree86/os-support/misc/IODelay.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */ /******************************************************************************* Copyright 1994 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 57176c5d5..e14a86f91 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -4,7 +4,7 @@ Stub for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/misc/PortIO.S b/hw/xfree86/os-support/misc/PortIO.S index 61aac6b89..75db31156 100644 --- a/hw/xfree86/os-support/misc/PortIO.S +++ b/hw/xfree86/os-support/misc/PortIO.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.1 2004/02/02 03:55:32 dawes Exp $ */ +/* $XFree86$ */ /* Port I/O functions for platforms with no inlining. */ diff --git a/hw/xfree86/os-support/misc/SlowBcopy.S b/hw/xfree86/os-support/misc/SlowBcopy.S index 9b6af1d69..9fd73a0f9 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.S +++ b/hw/xfree86/os-support/misc/SlowBcopy.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.s,v 1.2 1998/07/25 16:56:50 dawes Exp $ */ /******************************************************************************* Copyright 1994 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index 98546b688..727ec6598 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -4,7 +4,7 @@ for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6 2003/04/07 16:23:39 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */ /* * Create a dependency that should be immune from the effect of register @@ -26,13 +26,13 @@ void xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) { -#if defined(__ia64__) - outb(0x80, 0x00); -#endif while(len--) { *dst++ = *src++; -#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) +#if !defined(__sparc__) && \ + !defined(__powerpc__) && \ + !defined(__mips__) && \ + !defined(__ia64__) outb(0x80, 0x00); #endif } diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index 019156357..4172d3d39 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index 7889617e3..1b73dc654 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 899c3820b..d4ae2852f 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David McCullough <davidm@stallion.oz.au> diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 389664647..2b8a05be5 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index a018e3434..c9b7219cd 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 85b4bbd41..913884385 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_iop.c,v 1.1 2002/06/03 21:22:10 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright 2001 by J. Kean Johnston <jkj@caldera.com> * diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 37b9eb5a8..445afe822 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 3c00f5564..a11d957e1 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 265a45f91..6267da9a7 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 81aac54de..4ddb84450 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 5c24b9751..c295c2146 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index ee7584222..8f341e5e4 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/shared/inout.S b/hw/xfree86/os-support/shared/inout.S index 80c47c419..73a2cbbb6 100644 --- a/hw/xfree86/os-support/shared/inout.S +++ b/hw/xfree86/os-support/shared/inout.S @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.5 1996/12/23 06:50:58 dawes Exp $ */ #include "assyntax.h" diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index c24f4f1b2..fc1e83255 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index b6aa8fb29..34f375f6c 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -496,7 +496,7 @@ xf86mmap(void *start, xf86size_t length, int prot, if (flags & XF86_MAP_FIXED) f |= MAP_FIXED; if (flags & XF86_MAP_SHARED) f |= MAP_SHARED; if (flags & XF86_MAP_PRIVATE) f |= MAP_PRIVATE; -#if defined(__AMD64__) && defined(linux) +#if defined(__amd64__) && defined(linux) if (flags & XF86_MAP_32BIT) f |= MAP_32BIT; #endif if (prot & XF86_PROT_EXEC) p |= PROT_EXEC; diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 329346910..934ebbdba 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 1bb2da386..8e118938e 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index e63619e3a..5afef810c 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */ +/* $XFree86$ */ #ifndef _XF86_AXP_H_ #define _XF86_AXP_H_ diff --git a/hw/xfree86/os-support/solaris/apSolaris.shar b/hw/xfree86/os-support/solaris/apSolaris.shar index 33cecdc4d..c8e2cfa49 100644 --- a/hw/xfree86/os-support/solaris/apSolaris.shar +++ b/hw/xfree86/os-support/solaris/apSolaris.shar @@ -1,5 +1,5 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar,v 1.3 2002/10/04 19:45:33 tsi Exp $ +# $XFree86$ # This is a shell archive (produced by GNU sharutils 4.2c). # To extract the files from this archive, save it to some FILE, remove # everything before the `!/bin/sh' line above, then type `sh FILE'. diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index e93e0e9dd..dc984bd4b 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.3 2003/11/07 13:45:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index b08529a00..fe8205e13 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/solaris/sun_inout.s b/hw/xfree86/os-support/solaris/sun_inout.s index e8f03d0e8..5c0b23ef6 100644 --- a/hw/xfree86/os-support/solaris/sun_inout.s +++ b/hw/xfree86/os-support/solaris/sun_inout.s @@ -1,4 +1,4 @@ -/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $ +/ $XFree86$ / / Copyright 1994-2001 The XFree86 Project, Inc. All Rights Reserved. / diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 27996d312..9f3a235e5 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 058f1109a..0213a0732 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.2 2003/10/09 11:44:00 pascal Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.1 2001/05/28 02:42:31 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index f6481af29..30cf288ca 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.6 2003/10/09 11:44:00 pascal Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2003/08/26 19:00:36 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 2f4b84e99..02883f054 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.3 2002/10/03 02:04:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.2 2001/10/28 03:34:03 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 1e9166712..d8dea0f16 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index d48efd76e..c110f452e 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index c0460f524..2f7e4e723 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.21 2003/03/14 13:46:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.20tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index 0478ee65e..b8d8a9086 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993-1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h index 2085a3e70..45df28275 100644 --- a/hw/xfree86/os-support/sysv/xqueue.h +++ b/hw/xfree86/os-support/sysv/xqueue.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XF86_XQUEUE_H_ #define _XF86_XQUEUE_H_ diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 917b11526..344f7e901 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.6 2003/11/03 05:11:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 4d3205eb4..4df2d502a 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.95 2003/11/17 22:20:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.94 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany * Copyright 1992 by David Dawes <dawes@XFree86.org> diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 09d3f2861..b73270236 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -64,7 +64,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.57 2003/10/07 23:14:54 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index 61eb93d8b..ca54e480e 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.60 2003/10/26 12:17:17 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.1.4.3 2003/12/20 00:28:30 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -45,6 +46,7 @@ #define XF86_LIBC_H 1 #include "Xfuncs.h" +#include <stddef.h> /* * The first set of definitions are required both for modules and diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index fa22e220d..695c16505 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -24,7 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.14 2003/01/04 20:20:22 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.13 2003/01/01 19:22:20 paulo Exp $ * */ diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index 3cd3749ed..e2dbb3e91 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.6 2000/10/20 14:59:03 alanh Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index d8d5332f9..2b8cf7171 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.7 2002/09/16 18:06:18 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index c704bd75e..783d79b93 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.3 1999/06/12 07:19:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c index f0a960a66..fd436ef85 100644 --- a/hw/xfree86/rac/xf86RACmodule.c +++ b/hw/xfree86/rac/xf86RACmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.4 1999/01/26 05:54:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 3b42ecb13..440b0021b 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -23,7 +23,7 @@ * * BT RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index ea1180285..c52b5a745 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.3 1998/08/20 08:56:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ #include "xf86RamDac.h" diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index bea623b78..67469d2ed 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.2 1998/07/25 16:57:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ #include "BT.h" diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES index 3e901e380..726e2edc1 100644 --- a/hw/xfree86/ramdac/CURSOR.NOTES +++ b/hw/xfree86/ramdac/CURSOR.NOTES @@ -188,4 +188,4 @@ Flags -$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.5 2003/02/13 20:28:41 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.4tsi Exp $ diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 34562e297..69207c2e2 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -23,7 +23,7 @@ * * IBM RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.13 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index 546296630..00d039031 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.8 2001/10/28 03:34:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ #include <xf86RamDac.h> diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 6fecb7705..1a2bf2065 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ #include "IBM.h" diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 5e466b707..ce6dd9a04 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -24,7 +24,7 @@ * Modified from IBM.c to support TI RAMDAC routines * by Jens Owen, <jens@tungstengraphics.com>. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index 9451f814c..f87ebd13f 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.5 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ #include <xf86RamDac.h> diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index d81552764..81fe844a1 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ #include "TI.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 49379e934..eedb00377 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.20 2003/02/24 20:43:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index 5e5df46f3..ac88f4e5f 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.11 2003/02/15 03:14:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 5a6ab118a..603f8ecd0 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.5 2003/02/15 03:14:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 41b623a6a..ad9977d67 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.13 2003/03/04 21:21:15 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index b45be814d..7821e591c 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -23,7 +23,7 @@ * * Generic RAMDAC access routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 626a8b2b9..319a7b577 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 3b01081df..14cda093d 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -23,7 +23,7 @@ * * Generic RAMDAC access to colormaps. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.7 2000/07/26 01:52:24 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index 754949606..cb100d7bb 100644 --- a/hw/xfree86/ramdac/xf86RamDacMod.c +++ b/hw/xfree86/ramdac/xf86RamDacMod.c @@ -23,7 +23,7 @@ * * Generic RAMDAC module. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index f1eeb3a7d..45680a05b 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.4 1999/07/18 03:27:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ #include "xf86RamDac.h" #include "xf86cmap.h" diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids index 32d96cec8..a65732072 100644 --- a/hw/xfree86/scanpci/extrapci.ids +++ b/hw/xfree86/scanpci/extrapci.ids @@ -14,7 +14,8 @@ # changes/additions that aren't XFree86-specific to the pciids # project (http://pciids.sf.net/). # -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.10 2003/10/30 15:29:32 tsi Exp $ +# $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.1.4.2.4.2 2004/03/04 20:16:34 kaleb Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $ # # Vendors, devices and subsystems. Please keep sorted. @@ -39,6 +40,23 @@ 0002 " C 0401 -126f " - 0730 SM731 Cougar3DR - +# Some NVIDIA cards that are not in the master pci.ids file yet. +10de " + 0314 GeForce FX 5600SE + 031a GeForce FX Go5600 + 031b GeForce FX Go5650 + 031c Quadro FX Go700 + 0323 GeForce FX 5200SE + 0324 GeForce FX Go5200 + 0325 GeForce FX Go5250 + 0328 GeForce FX Go5200 32M/64M + 0329 GeForce FX 5200 (Mac) + 032a Quadro NVS 280 PCI + 032c GeForce FX Go5300 + 032d GeForce FX Go5100 + 0332 GeForce FX 5900XT + 0333 GeForce FX 5950 Ultra + 0341 GeForce FX 5700 Ultra + 0342 GeForce FX 5700 + 034e Quadro FX 1100 + diff --git a/hw/xfree86/scanpci/pci.ids b/hw/xfree86/scanpci/pci.ids index 0d6a460f3..a172fd690 100644 --- a/hw/xfree86/scanpci/pci.ids +++ b/hw/xfree86/scanpci/pci.ids @@ -7,7 +7,7 @@ # so if you have anything to contribute, please visit the home page or # send a diff -u against the most recent pci.ids to pci-ids@ucw.cz. # -# Daily snapshot on Wed 2003-05-14 10:00:04 +# Daily snapshot on Sun 2004-02-15 11:00:07 # # Vendors, devices and subsystems. Please keep sorted. @@ -24,6 +24,12 @@ # Real TJN ID is e159, but they got it wrong several times --mj 0059 Tiger Jet Network Inc. (Wrong ID) 0070 Hauppauge computer works Inc. +# WinTV Personal Video Recorder 350 (video capture card) + 4000 WinTV PVR-350 +# WinTV Personal Video Recorder 250 (video capture card) - original release + 4001 WinTV PVR-250 (v1) +# WinTV Personal Video Recorder 250 (video capture card) + 4009 WinTV PVR-250 0100 Ncipher Corp Ltd 0675 Dynalink 1700 IS64PH ISDN Adapter @@ -118,6 +124,8 @@ 0e11 7004 Embedded Ultra Wide SCSI Controller 1092 8760 FirePort 40 Dual SCSI Controller 1de1 3904 DC390F Ultra Wide SCSI Controller + 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard + 4c53 1050 CT7 mainboard 0010 53c895 0e11 4040 Integrated Array Controller 0e11 4048 Integrated Array Controller @@ -126,6 +134,9 @@ 0020 53c1010 Ultra3 SCSI Adapter 1de1 1020 DC-390U3W 0021 53c1010 66MHz Ultra3 SCSI Adapter + 4c53 1080 CT8 mainboard + 4c53 1300 P017 mezzanine (32-bit PMC) + 4c53 1310 P017 mezzanine (64-bit PMC) 0030 53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI 1028 1010 LSI U320 SCSI Controller 0040 53c1035 @@ -162,15 +173,37 @@ 9100 INI-9100/9100W SCSI Host 1002 ATI Technologies Inc 4136 Radeon IGP 320 M -# New support forthcoming in XFree86 4.3.0 4144 Radeon R300 AD [Radeon 9500 Pro] -# New support forthcoming in XFree86 4.3.0 - 4145 Radeon R300 AE [Radeon 9500 Pro] -# New support forthcoming in XFree86 4.3.0 - 4146 Radeon R300 AF [Radeon 9500 Pro] -# Update: Oops, AF was a typo above for 4147, should be AG +# New PCI ID provided by ATI developer relations (correction to above) + 4145 R300 AE [Radeon 9700 Pro] +# New PCI ID provided by ATI developer relations (oops, correction to above) + 4146 R300 AF [Radeon 9700 Pro] 4147 Radeon R300 AG [FireGL Z1/X1] +# Updated 2 letter ASIC code I initially missed in above entry submission + 4148 Radeon R350 AH [Radeon 9800] +# New PCI ID provided by ATI developer relations + 4149 Radeon R350 AI [Radeon 9800] +# New PCI ID provided by ATI developer relations + 4150 RV350 AP [Radeon 9600] +# New PCI ID provided by ATI developer relations + 4151 RV350 AQ [Radeon 9600] +# New PCI ID provided by ATI developer relations + 4152 RV350 AR [Radeon 9600] 4158 68800AX [Mach32] +# The PCI ID is unrelated to any DVI output. + 4164 R300 AD [Radeon 9500 Pro] (Secondary) +# New PCI ID info provided by ATI developer relations + 4165 R300 AE [Radeon 9700 Pro] (Secondary) +# New PCI ID info provided by ATI developer relations + 4166 R300 AF [Radeon 9700 Pro] (Secondary) +# New PCI ID provided by ATI developer relations + 4168 Radeon R350 [Radeon 9800] (Secondary) +# New PCI ID provided by ATI developer relations (correction to above) + 4170 RV350 AP [Radeon 9600] (Secondary) +# New PCI ID provided by ATI developer relations (correction to above) + 4171 RV350 AQ [Radeon 9600] (Secondary) +# New PCI ID provided by ATI developer relations (correction to above) + 4172 RV350 AR [Radeon 9600] (Secondary) 4242 Radeon R200 BB [Radeon All in Wonder 8500DV] 1002 02aa Radeon 8500 AIW DV Edition 4336 Radeon Mobility U1 @@ -225,6 +258,7 @@ 1002 0008 Rage XL 1002 4752 Rage XL 1002 8008 Rage XL + 1028 00ce PowerEdge 1400 1028 00d1 PowerEdge 2550 4753 Rage XC 1002 4753 Rage XC @@ -243,20 +277,20 @@ 475a 3D Rage IIC AGP 1002 0087 Rage 3D IIC 1002 475a Rage IIC AGP - 4964 Radeon R250 Id [Radeon 9000] - 4965 Radeon R250 Ie [Radeon 9000] - 4966 Radeon R250 If [Radeon 9000] - 10f1 0002 R250 If [Tachyon G9000 PRO] - 148c 2039 R250 If [Radeon 9000 Pro "Evil Commando"] - 1509 9a00 R250 If [Radeon 9000 "AT009"] -# New subdevice - 3D Prophet 9000 PCI by Hercules. AGP version probably would have same ID, so not specified. - 1681 0040 R250 If [3D prophet 9000] - 174b 7176 R250 If [Sapphire Radeon 9000 Pro] - 174b 7192 R250 If [Radeon 9000 "Atlantis"] - 17af 2005 R250 If [Excalibur Radeon 9000 Pro] - 17af 2006 R250 If [Excalibur Radeon 9000] - 4967 Radeon R250 Ig [Radeon 9000] - 496e Radeon R250 [Radeon 9000] (Secondary) + 4964 Radeon RV250 Id [Radeon 9000] + 4965 Radeon RV250 Ie [Radeon 9000] + 4966 Radeon RV250 If [Radeon 9000] + 10f1 0002 RV250 If [Tachyon G9000 PRO] + 148c 2039 RV250 If [Radeon 9000 Pro "Evil Commando"] + 1509 9a00 RV250 If [Radeon 9000 "AT009"] +# New subdevice - 3D Prophet 9000 PCI by Hercules. AGP version probably would have same ID, so not specified. + 1681 0040 RV250 If [3D prophet 9000] + 174b 7176 RV250 If [Sapphire Radeon 9000 Pro] + 174b 7192 RV250 If [Radeon 9000 "Atlantis"] + 17af 2005 RV250 If [Excalibur Radeon 9000 Pro] + 17af 2006 RV250 If [Excalibur Radeon 9000] + 4967 Radeon RV250 Ig [Radeon 9000] + 496e Radeon RV250 [Radeon 9000] (Secondary) 4c42 3D Rage LT Pro AGP-133 0e11 b0e8 Rage 3D LT Pro 0e11 b10e 3D Rage LT Pro (Compaq Armada 1750) @@ -268,6 +302,7 @@ 4c44 3D Rage LT Pro AGP-66 4c45 Rage Mobility M3 AGP 4c46 Rage Mobility M3 AGP 2x + 1028 00b1 Latitude C600 4c47 3D Rage LT-G 215LG 4c49 3D Rage LT Pro 1002 0004 Rage LT Pro @@ -276,8 +311,10 @@ 1002 4c49 Rage LT Pro 4c4d Rage Mobility P/M AGP 2x 0e11 b111 Armada M700 + 0e11 b160 Armada E500 1002 0084 Xpert 98 AGP 2X (Mobility) 1014 0154 ThinkPad A20m + 1028 00aa Latitude CPt 4c4e Rage Mobility L AGP 2x 4c50 3D Rage LT Pro 1002 4c50 Rage LT Pro @@ -289,35 +326,42 @@ 1014 0517 ThinkPad T30 1028 00e6 Radeon Mobility M7 LW (Dell Inspiron 8100) 144d c006 Radeon Mobility M7 LW in vpr Matrix 170B4 -# Update: More correct labelling for this FireGL chipset 4c58 Radeon RV200 LX [Mobility FireGL 7800 M7] 4c59 Radeon Mobility M6 LY 1014 0235 ThinkPad A30p (2653-64G) 1014 0239 ThinkPad X22/X23/X24 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 4c5a Radeon Mobility M6 LZ -# Update: Add M9 to product name 4c64 Radeon R250 Ld [Radeon Mobility 9000 M9] -# Update: Add M9 to product name 4c65 Radeon R250 Le [Radeon Mobility 9000 M9] -# Update: Add M9 to product name 4c66 Radeon R250 Lf [Radeon Mobility 9000 M9] -# Update: Add M9 to product name 4c67 Radeon R250 Lg [Radeon Mobility 9000 M9] +# Secondary chip to the Lf + 4c6e Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary] 4d46 Rage Mobility M4 AGP 4d4c Rage Mobility M4 AGP 4e44 Radeon R300 ND [Radeon 9700 Pro] 4e45 Radeon R300 NE [Radeon 9500 Pro] 1002 0002 Radeon R300 NE [Radeon 9500 Pro] - 4e46 Radeon R300 NF [Radeon 9700] -# Update: This is FireGL X1, not Radeon 9700 +# New PCI ID provided by ATI developer relations (correction to above) + 4e46 RV350 NF [Radeon 9600] 4e47 Radeon R300 NG [FireGL X1] 4e48 Radeon R350 [Radeon 9800] +# New PCI ID provided by ATI developer relations + 4e49 Radeon R350 [Radeon 9800] +# New PCI ID provided by ATI developer relations + 4e50 RV350 [Mobility Radeon 9600 M10] +# New PCI ID provided by ATI developer relations + 4e52 RV350 [Mobility Radeon 9600 M10] 4e64 Radeon R300 [Radeon 9700 Pro] (Secondary) 4e65 Radeon R300 [Radeon 9500 Pro] (Secondary) - 4e66 Radeon R300 [Radeon 9700] (Secondary) + 1002 0003 Radeon R300 NE [Radeon 9500 Pro] +# New PCI ID provided by ATI developer relations (correction to above) + 4e66 RV350 NF [Radeon 9600] (Secondary) 4e67 Radeon R300 [FireGL X1] (Secondary) 4e68 Radeon R350 [Radeon 9800] (Secondary) +# New PCI ID provided by ATI developer relations + 4e69 Radeon R350 [Radeon 9800] (Secondary) 5041 Rage 128 PA/PRO 5042 Rage 128 PB/PRO AGP 2x 5043 Rage 128 PC/PRO AGP 4x @@ -354,7 +398,6 @@ 5056 Rage 128 PV/PRO TMDS 5057 Rage 128 PW/PRO AGP 2x TMDS 5058 Rage 128 PX/PRO AGP 4x TMDS -# Update: This same chip is used in all 32Mb and 64Mb SDR/DDR orig Radeons, and is now known as 7200 5144 Radeon R100 QD [Radeon 7200] 1002 0008 Radeon 7000/Radeon VE 1002 0009 Radeon 7000/Radeon @@ -385,11 +428,8 @@ 1002 013a Radeon 8500 148c 2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 174b 7149 Radeon R200 QL [Sapphire Radeon 8500 LE] -# New: Radeon 9100 is basically a Radeon 8500LE branded as 9100 by Sapphire 514d Radeon R200 QM [Radeon 9100] -# New: Radeon 8500LE chip 514e Radeon R200 QN [Radeon 8500LE] -# New: Radeon 8500LE chip 514f Radeon R200 QO [Radeon 8500LE] 5157 Radeon RV200 QW [Radeon 7500] 1002 013a Radeon 7500 @@ -401,7 +441,6 @@ 174b 7161 Radeon RV200 QW [Radeon 7500 LE] 17af 0202 RV200 QW [Excalibur Radeon 7500LE] 5158 Radeon RV200 QX [Radeon 7500] -# Update: More correct name 5159 Radeon RV100 QY [Radeon 7000/VE] 1002 000a Radeon 7000/Radeon VE 1002 000b Radeon 7000 @@ -414,13 +453,12 @@ 148c 2023 RV100 QY [Radeon 7000 Evil Master Multi-Display] 174b 7112 RV100 QY [Sapphire Radeon VE 7000] 1787 0202 RV100 QY [Excalibur Radeon 7000] -# Update: More correct name 515a Radeon RV100 QZ [Radeon 7000/VE] 5168 Radeon R200 Qh 5169 Radeon R200 Qi 516a Radeon R200 Qj 516b Radeon R200 Qk -# new: This one is not in ATI documentation, but is in XFree86 source code +# This one is not in ATI documentation, but is in XFree86 source code 516c Radeon R200 Ql 5245 Rage 128 RE/SG 1002 0008 Xpert 128 @@ -472,8 +510,10 @@ 1002 5654 Mach64VT Reference 5655 264VT3 [Mach64 VT3] 5656 264VT4 [Mach64 VT4] + 5961 Radeon RV280 [Radeon 9200] 700f PCI Bridge [IGP 320M] 7010 PCI Bridge [IGP 340M] + cab0 AGP Bridge [IGP 320M] cab2 RS200/RS200M AGP Bridge [IGP 340M] 1003 ULSI Systems 0201 US201 @@ -528,7 +568,14 @@ 0011 NS87560 National PCI System I/O 0012 USB Controller 0020 DP83815 (MacPhyter) Ethernet Controller + 1385 f311 FA311 / FA312 (FA311 with WoL HW) 0022 DP83820 10/100/1000 Ethernet Controller + 0028 CS5535 Host bridge + 002b CS5535 ISA bridge + 002d CS5535 IDE + 002e CS5535 Audio + 002f CS5535 USB + 0030 CS5535 Video 0500 SCx200 Bridge 0501 SCx200 SMI 0502 SCx200 IDE @@ -630,7 +677,9 @@ 0e11 4051 Integrated Smart Array 0e11 4058 Integrated Smart Array 103c 10c2 Hewlett-Packard NetRAID-4M - 12d9 000a VoIP PCI Gateway + 12d9 000a IP Telephony card + 4c53 1050 CT7 mainboard + 4c53 1051 CE7 mainboard 9005 0365 Adaptec 5400S 9005 1364 Dell PowerEdge RAID Controller 2 9005 1365 Dell PowerEdge RAID Controller 2 @@ -695,14 +744,17 @@ 001b GXT-150P 001c Carrera 001d 82G2675 - 0020 MCA + 0020 GXT1000 Graphics Adapter 0022 IBM27-82351 002d Python - 002e ServeRAID Controller +# [official name in AIX 5] + 002e SCSI RAID Adapter [ServeRAID] 1014 002e ServeRAID-3x 1014 022e ServeRAID-4H + 0031 2 Port Serial Adapter 0036 Miami 003a CPU to PCI Bridge + 003c GXT250P/GXT255P Graphics Adapter 003e 16/4 Token ring UTP/STP controller 1014 003e Token-Ring Adapter 1014 00cd Token-Ring Adapter + Wake-On-LAN @@ -720,23 +772,30 @@ 004f ATM Controller (14104f00) 0050 ATM Controller (14105000) 0053 25 MBit ATM Controller + 0054 GXT500P/GXT550P Graphics Adapter 0057 MPEG PCI Bridge 005c i82557B 10/100 + 005e GXT800P Graphics Adapter 007c ATM Controller (14107c00) 007d 3780IDSP [MWave] + 008e GXT3000P Graphics Adapter 0090 GXT 3000P 1014 008e GXT-3000P + 0091 SSA Adapter 0095 20H2999 PCI Docking Bridge 0096 Chukar chipset SCSI controller 1014 0097 iSeries 2778 DASD IOA 1014 0098 iSeries 2763 DASD IOA 1014 0099 iSeries 2748 DASD IOA + 009f PCI 4758 Cryptographic Accelerator 00a5 ATM Controller (1410a500) 00a6 ATM 155MBPS MM Controller (1410a600) 00b7 256-bit Graphics Rasterizer [Fire GL1] + 00b8 GXT2000P Graphics Adapter 00be ATM 622MBPS Controller (1410be00) 00dc Advanced Systems Management Adapter (ASMA) 00fc CPC710 Dual Bridge and Memory Controller (PCI-64) + 0104 Gigabit Ethernet-SX Adapter 0105 CPC710 Dual Bridge and Memory Controller (PCI-32) 010f Remote Supervisor Adapter (RSA) 0142 Yotta Video Compositor Input @@ -744,6 +803,14 @@ 0144 Yotta Video Compositor Output 1014 0145 Yotta Output Controller (ytout) 0156 405GP PLB to PCI Bridge + 015e 622Mbps ATM PCI Adapter + 0160 64bit/66MHz PCI ATM 155 MMF + 016e GXT4000P Graphics Adapter + 0170 GXT6000P Graphics Adapter + 017d GXT300P Graphics Adapter + 0180 Snipe chipset SCSI controller + 1014 0241 iSeries 2757 DASD IOA + 1014 0264 Quad Channel PCI-X U320 SCSI RAID Adapter (2780) 01a7 PCI-X to PCI-X Bridge 01bd ServeRAID Controller 1014 01be ServeRAID-4M @@ -753,6 +820,19 @@ 1014 022e ServeRAID-4H 1014 0258 ServeRAID-5i 1014 0259 ServeRAID-5i + 01c1 64bit/66MHz PCI ATM 155 UTP + 01e6 Cryptographic Accelerator + 01ff 10/100 Mbps Ethernet + 0219 Multiport Serial Adapter + 1014 021a Dual RVX + 1014 0251 Internal Modem/RVX + 1014 0252 Quad Internal Modem + 021b GXT6500P Graphics Adapter + 021c GXT4500P Graphics Adapter + 0233 GXT135P Graphics Adapter + 0266 PCI-X Dual Channel SCSI + 0268 Gigabit Ethernet-SX Adapter (PCI-X) + 0269 10/100/1000 Base-TX Ethernet Adapter (PCI-X) 0302 XA-32 chipset [Summit] ffff MPIC-2 interrupt controller 1015 LSI Logic Corp of Canada @@ -815,9 +895,16 @@ 1259 2454 AT-2450v4 10Mb Ethernet Adapter 1259 2700 AT-2700TX 10/100 Fast Ethernet 1259 2701 AT-2700FX 100Mb Ethernet + 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard + 4c53 1010 CP5/CR6 mainboard + 4c53 1020 VR6 mainboard + 4c53 1030 PC5 mainboard + 4c53 1040 CL7 mainboard + 4c53 1060 PC7 mainboard 2001 79c978 [HomePNA] 1092 0a78 Multimedia Home Network Adapter 1668 0299 ActionLink Home Network Adapter + 2003 Am 1771 MBW [Alchemy] 2020 53c974 [PCscsi] 2040 79c974 3000 ELanSC520 Microcontroller @@ -862,6 +949,7 @@ 746b AMD-8111 ACPI 746d AMD-8111 AC97 Audio 746e AMD-8111 MC97 Modem + 756b AMD-8111 ACPI 1023 Trident Microsystems 0194 82C194 2000 4DWave DX @@ -1130,6 +1218,12 @@ 00b8 F64310 00c0 F69000 HiQVideo 102c 00c0 F69000 HiQVideo + 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard + 4c53 1010 CP5/CR6 mainboard + 4c53 1020 VR6 mainboard + 4c53 1030 PC5 mainboard + 4c53 1050 CT7 mainboard + 4c53 1051 CE7 mainboard 00d0 F65545 00d8 F65545 00dc F65548 @@ -1141,6 +1235,11 @@ 00f4 F68554 HiQVision 00f5 F68555 0c30 F69030 + 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard + 4c53 1050 CT7 mainboard + 4c53 1051 CE7 mainboard +# C5C project cancelled + 4c53 1080 CT8 mainboard 102d Wyse Technology Inc. 50dc 3328 Audio 102e Olivetti Advanced Technology @@ -1156,6 +1255,7 @@ 6057 MiroVideo DC10/DC30+ 1032 Compaq 1033 NEC Corporation + 0000 Vr4181A USB Host or Function Control Unit 0001 PCI to 486-like bus Bridge 0002 PCI to VL98 Bridge 0003 ATM Controller @@ -1196,9 +1296,11 @@ 00a6 VRC5477 AC97 00cd IEEE 1394 [OrangeLink] Host Controller 12ee 8011 Root hub + 00df Vr4131 00e0 USB 2.0 12ee 7001 Root hub 1799 0002 Root Hub + 00f3 uPD6113x Multimedia Decoder/Processor [EMMA2] 1034 Framatome Connectors USA Inc. 1035 Comp. & Comm. Research Lab 1036 Future Domain Corp. @@ -1243,9 +1345,11 @@ 0735 735 Host 0740 740 Host 0745 745 Host + 0746 746 Host 0755 SiS 755 Host Bridge 0900 SiS900 10/100 Ethernet 1039 0900 SiS900 10/100 Ethernet Adapter + 1043 8035 CUSI-FX motherboard 0961 SiS961 [MuTIOL Media IO] 0962 SiS962 [MuTIOL Media IO] 3602 83C602 @@ -1257,6 +1361,7 @@ 5513 5513 [IDE] 1019 0970 P6STP-FL motherboard 1039 5513 SiS5513 EIDE Controller (A,B step) + 1043 8035 CUSI-FX motherboard 5517 5517 5571 5571 5581 5581 Pentium Chipset @@ -1270,6 +1375,7 @@ 6236 6236 3D-AGP 6300 SiS630 GUI Accelerator+3D 1019 0970 P6STP-FL motherboard + 1043 8035 CUSI-FX motherboard 6306 SiS530 3D PCI/AGP 1039 6306 SiS530,620 GUI Accelerator+3D 6325 SiS650/651/M650/740 PCI/AGP VGA Display Adapter @@ -1312,6 +1418,7 @@ 15c5 0111 SiS PCI Audio Accelerator 270f a171 SiS PCI Audio Accelerator a0a0 0022 SiS PCI Audio Accelerator + 7019 SiS7019 Audio Accelerator 103a Seiko Epson Corporation 103b Tatung Co. of America 103c Hewlett-Packard Company @@ -1372,6 +1479,7 @@ 1043 Asustek Computer, Inc. 0675 ISDNLink P-IN100-ST-D 4021 v7100 Combo Deluxe [GeForce2 MX + TV tuner] + 4057 v8200 GeForce 3 1044 Distributed Processing Technology 1012 Domino RAID Engine a400 SmartCache/Raid I-IV Controller @@ -1433,7 +1541,7 @@ c832 82C832 c861 82C861 c895 82C895 - c935 EV1935 ECTIVA MachOne PCI Audio + c935 EV1935 ECTIVA MachOne PCIAudio d568 82C825 [Firebridge 2] d721 IDE [FireStar] 1046 IPC Corporation, Ltd. @@ -1443,16 +1551,24 @@ 1000 QuickStep 1000 3000 QuickStep 3000 1049 Fountain Technologies, Inc. -104a SGS Thomson Microelectronics +# # nee SGS Thomson Microelectronics +104a STMicroelectronics 0008 STG 2000X 0009 STG 1764X 0010 STG4000 [3D Prophet Kyro Series] + 0209 STPC Consumer/Industrial North- and Southbridge + 020a STPC Atlas/ConsumerS/Consumer IIA Northbridge # From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors> 0210 STPC Atlas ISA Bridge + 021a STPC Consumer S Southbridge + 021b STPC Consumer IIA Southbridge + 0500 ST70137 [Unicorn] ADSL DMT Transceiver + 0564 STPC Client Northbridge 0981 DEC-Tulip compatible 10/100 Ethernet 1746 STG 1764X 2774 DEC-Tulip compatible 10/100 Ethernet 3520 MPEG-II decoder card + 55cc STPC Client Southbridge 104b BusLogic 0140 BT-946C (old) [multimaster 01] 1040 BT-946C (BA80C30) [MultiMaster 10] @@ -1505,7 +1621,11 @@ 8026 TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link) 8027 PCI4451 IEEE-1394 Controller 1028 00e6 PCI4451 IEEE-1394 Controller (Dell Inspiron 8100) + 8029 PCI4510 IEEE-1394 Controller 8400 ACX 100 22Mbps Wireless Interface + 8401 ACX 100 22Mbps Wireless Interface +# OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter (whi + 9000 Wireless Interface (of unknown type) a001 TDC1570 a100 TDC1561 a102 TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f @@ -1523,6 +1643,7 @@ ac1b PCI1450 0e11 b113 Armada M700 ac1c PCI1225 + 0e11 b121 Armada E500 ac1d PCI1251A ac1e PCI1211 ac1f PCI1251B @@ -1536,9 +1657,11 @@ ac41 PCI4410 PC card Cardbus Controller ac42 PCI4451 PC card Cardbus Controller 1028 00e6 PCI4451 PC card CardBus Controller (Dell Inspiron 8100) + ac44 PCI4510 PC card Cardbus Controller ac50 PCI1410 PC card Cardbus Controller ac51 PCI1420 1014 023b ThinkPad T23 (2647-4MG) + 1028 00b1 Latitude C600 10cf 1095 Lifebook C6155 e4bf 1000 CP2-2-HIPHOP ac52 PCI1451 PC card Cardbus Controller @@ -1627,6 +1750,7 @@ 0d38 20263 105a 4d39 Fasttrak66 1275 20275 + 3318 PDC20318 (SATA150 TX4) 3376 PDC20376 1043 809e A7V8X motherboard 4d30 20267 @@ -1649,6 +1773,7 @@ 6269 PDC20271 105a 6269 FastTrak TX2/TX2000 6621 PDC20621 [SX4000] 4 Channel IDE RAID Controller + 6629 PDC20619 FastTrak TX4000 RAID 7275 PDC20277 105b Foxconn International, Inc. 105c Wipro Infotech Limited @@ -1735,6 +1860,7 @@ 0002 DAC960PD 0010 DAC960PX 0050 AcceleRAID 352/170/160 support Device + b166 Gemstone chipset SCSI controller ba55 eXtremeRAID 1100 support Device ba56 eXtremeRAID 2000/3000 support Device 106a Aten Research Inc @@ -1962,6 +2088,8 @@ 1190 PCI-MIO-16E-4 1330 PCI-6031E 1350 PCI-6071E + 17d0 PCI-6503 + 2410 PCI-6733 2a60 PCI-6023E b001 IMAQ-PCI-1408 b011 IMAQ-PXI-1408 @@ -2229,6 +2357,7 @@ d84d 4078 EX-4078 2S(16C552) RS-232+1P 9054 PCI <-> IOBus Bridge 10b5 2455 Wessex Techology PHIL-PCI + 10b5 2696 Innes Corp AM Radcap card 12d9 0002 PCI Prosody Card rev 1.5 9060 9060 906d 9060SD @@ -2238,6 +2367,7 @@ 10b5 9080 9080 [real subsystem ID not set] 129d 0002 Aculab PCI Prosidy card 12d9 0002 PCI Prosody Card + bb04 B&B 3PCIOSD1A Isolated PCI Serial 10b6 Madge Networks 0001 Smart 16/4 PCI Ringnode 0002 Smart 16/4 PCI Ringnode Mk2 @@ -2269,6 +2399,7 @@ 1006 MINI PCI type 3B Data Fax Modem 1007 Mini PCI 56k Winmodem 10b7 615c Mini PCI 56K Modem + 1700 3c940 1000Base? 3390 3c339 TokenLink Velocity 3590 3c359 TokenLink Velocity XL 10b7 3590 TokenLink Velocity XL Adapter (3C359/359B) @@ -2301,6 +2432,7 @@ 10b7 656b 3CCFEM656 10/100 LAN+56K Modem CardBus 6564 3CCFEM656 [id 6564] Cyclone CardBus 7646 3cSOHO100-TX Hurricane + 7770 3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect] 7940 3c803 FDDILink UTP Controller 7980 3c804 FDDILink SAS Controller 7990 3c805 FDDILink DAS Controller @@ -2341,7 +2473,8 @@ 9058 3c905B-Combo [Deluxe Etherlink XL 10/100] 905a 3c905B-FX [Fast Etherlink XL FX 10/100] 9200 3c905C-TX/TX-M [Tornado] - 1028 0095 Integrated 3C905C-TX Fast Etherlink for PC Management NIC + 1028 0095 3C920 Integrated Fast Ethernet Controller + 1028 0097 3C920 Integrated Fast Ethernet Controller 10b7 1000 3C905C-TX Fast Etherlink for PC Management NIC 10b7 7000 10/100 Mini PCI Ethernet Adapter 9201 3C920B-EMB Integrated Fast Ethernet Controller @@ -2524,7 +2657,10 @@ 10c9 Dataexpert Corporation 10ca Fujitsu Microelectr., Inc. 10cb Omron Corporation -10cc Mentor ARC Inc +# nee Mentor ARC Inc +10cc Mai Logic Incorporated + 0660 Articia S Host Bridge + 0661 Articia S PCI Bridge 10cd Advanced System Products, Inc 1100 ASC1100 1200 ASC1200 [(abp940) Fast SCSI-II] @@ -2533,9 +2669,9 @@ 2300 ABP940-UW 2500 ABP940-U2W 10ce Radius -10cf Citicorp TTI +# nee Citicorp TTI +10cf Fujitsu Limited. 2001 mb86605 -10d0 Fujitsu Limited 10d1 FuturePlus Systems Corp. 10d2 Molex Incorporated 10d3 Jabil Circuit Inc @@ -2644,9 +2780,21 @@ 1043 0c11 A7N8X Mainboard 006a nForce2 AC97 Audio Controler (MCP) 006b nForce MultiMedia audio [Via VT82C686B] + 006c nForce2 External PCI Bridge + 006d nForce2 PCI Bridge 006e nForce2 FireWire (IEEE 1394) Controller 00a0 NV5 [Aladdin TNT2] 14af 5810 Maxi Gamer Xentor + 00d0 nForce3 LPC Bridge + 00d1 nForce3 Host Bridge + 00d2 nForce3 AGP Bridge + 00d4 nForce3 SMBus + 00d5 nForce3 IDE + 00d6 nForce3 Ethernet + 00d7 nForce3 USB 1.1 + 00d8 nForce3 USB 2.0 + 00da nForce3 Audio + 00dd nForce3 PCI Bridge 0100 NV10 [GeForce 256 SDR] 1043 0200 AGP-V6600 SGRAM 1043 0201 AGP-V6600 SDRAM @@ -2658,6 +2806,7 @@ 1043 0202 AGP-V6800 DDR 1043 400a AGP-V6800 DDR SGRAM 1043 400b AGP-V6800 DDR SDRAM + 107d 2822 WinFast GeForce 256 1102 102e CT6971 GeForce 256 DDR 14af 5021 3D Prophet DDR-DVI 0103 NV10GL [Quadro] @@ -2696,12 +2845,14 @@ 017b NV17GL [Quadro4 550 XGL] 017c NV17GL [Quadro4 550 GoGL] 0181 NV18 [GeForce4 MX 440 AGP 8x] + 1043 806f V9180 Magic + 1462 8880 MS-StarForce GeForce4 MX 440 with AGP8X 0182 NV18 [GeForce4 MX 440SE AGP 8x] 0183 NV18 [GeForce4 MX 420 AGP 8x] 0188 NV18GL [Quadro4 580 XGL] - 018a NV18GL [Quadro4 NVS] + 018a NV18GL [Quadro4 NVS AGP 8x] 018b NV18GL [Quadro4 380 XGL] - 01a0 NV15 [GeForce2 - nForce GPU] + 01a0 NVCrush11 [GeForce2 MX Integrated Graphics] 01a4 nForce CPU bridge 01ab nForce 420 Memory Controller (DDR) 01ac nForce 220/420 Memory Controller @@ -2715,7 +2866,14 @@ 01c1 Intel 537 [nForce MC97 Modem] 01c2 nForce USB Controller 01c3 nForce Ethernet Controller + 01e0 nForce2 AGP (different version?) 01e8 nForce2 AGP + 01ea nForce2 Memory Controller 0 + 01eb nForce2 Memory Controller 1 + 01ec nForce2 Memory Controller 2 + 01ed nForce2 Memory Controller 3 + 01ee nForce2 Memory Controller 4 + 01ef nForce2 Memory Controller 5 01f0 NV18 [GeForce4 MX - nForce GPU] 0200 NV20 [GeForce3] 1043 402f AGP-V8200 DDR @@ -2736,6 +2894,7 @@ 0280 NV28 [GeForce4 Ti 4800] 0281 NV28 [GeForce4 Ti 4200 AGP 8x] 0282 NV28 [GeForce4 Ti 4800 SE] + 0286 NV28 [GeForce4 Ti 4200 Go AGP 8x] 0288 NV28GL [Quadro4 980 XGL] 0289 NV28GL [Quadro4 780 XGL] 0300 NV30 [GeForce FX] @@ -2743,6 +2902,14 @@ 0302 NV30 [GeForce FX 5800] 0308 NV30GL [Quadro FX 2000] 0309 NV30GL [Quadro FX 1000] + 0311 NV31 [GeForce FX 5600 Ultra] + 0312 NV31 [GeForce FX 5600] + 0321 NV34 [GeForce FX 5200 Ultra] + 0322 NV34 [GeForce FX 5200] + 032b NV34GL [Quadro FX 500] + 0330 NV35 [GeForce FX 5900 Ultra] + 0331 NV35 [GeForce FX 5900] + 0338 NV35GL [Quadro FX 3000] 10df Emulex Corporation 1ae5 LP6000 Fibre Channel Host Adapter f085 LP850 Fibre Channel Adapter @@ -2789,6 +2956,7 @@ 811a PCI-IEEE1355-DS-DE Interface 8170 S5933 [Matchmaker] (Chipset Development Tool) 82db AJA HDNTV HD SDI Framestore + 8851 S5933 on Innes Corp FM Radio Capture card 10e9 Alps Electric Co., Ltd. 10ea Intergraphics Systems 1680 IGA-1680 @@ -2848,6 +3016,7 @@ 3fc3 RME Digi96/8 Pad 3fc4 RME Digi9652 (Hammerfall) 3fc5 RME Hammerfall DSP + 8381 Ellips Santos Frame Grabber 10ef Racore Computer Products, Inc. 8154 M815x Token Ring Adapter 10f0 Peritek Corporation @@ -2946,6 +3115,7 @@ 1043 808c A7V8X motherboard 1106 0571 VT82C586/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE 1179 0001 Magnia Z310 + 1297 f641 FX41 motherboard 1458 5002 GA-7VAX Mainboard 0576 VT82C576 3V [Apollo Master] 0585 VT82C585VP [Apollo VP1/VPX] @@ -2988,6 +3158,7 @@ 1019 0985 P6VXA Motherboard 1043 808c A7V8X motherboard 1179 0001 Magnia Z310 + 1458 5004 GA-7VAX Mainboard 3040 VT82C586B ACPI 3043 VT86C100A [Rhine] 10bd 0000 VT86C100A Fast Ethernet Adapter @@ -3012,6 +3183,7 @@ 15dd 7609 Onboard Audio 3059 VT8233/A/8235 AC97 Audio Controller 1043 8095 A7V8X Motherboard (Realtek ALC650 codec) + 1297 c160 FX41 motherboard (Realtek ALC650 codec) 1458 a002 GA-7VAX Onboard Audio (Realtek ALC650) 3065 VT6102 [Rhine-II] 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 @@ -3030,11 +3202,13 @@ 3103 VT8615 Host Bridge 3104 USB 2.0 1043 808c A7V8X motherboard + 1297 f641 FX41 motherboard 1458 5004 GA-7VAX Mainboard 3106 VT6105 [Rhine-III] 3109 VT8233C PCI to ISA Bridge 3112 VT8361 [KLE133] Host Bridge 3116 VT8375 [KM266/KL266] Host Bridge + 1297 f641 FX41 motherboard # found on EPIA M6000/9000 mainboard 3122 VT8623 [Apollo CLE266] integrated CastleRock graphics # found on EPIA M6000/9000 mainboard @@ -3047,6 +3221,7 @@ 3168 VT8374 P4X400 Host Controller/AGP Bridge 3177 VT8235 ISA Bridge 1043 808c A7V8X motherboard + 1297 f641 FX41 motherboard 1458 5001 GA-7VAX Mainboard 3189 VT8377 [KT400 AGP] Host Bridge 1043 807f A7V8X motherboard @@ -3073,6 +3248,7 @@ b103 VT8615 AGP Bridge b112 VT8361 [KLE133] AGP Bridge b168 VT8235 PCI Bridge + b198 VT8237 PCI Bridge 1107 Stratus Computers 0576 VIA VT82C570MV [Apollo] (Wrong vendor ID!) 1108 Proteon, Inc. @@ -3096,6 +3272,7 @@ 007c FSC Remote Service Controller, shared memory device 007d FSC Remote Service Controller, SMIC device 2102 DSCC4 WAN adapter + 4021 SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter) 4942 FPGA I-Bus Tracer for MBD 6120 SZB6120 110b Chromatic Research Inc. @@ -3265,7 +3442,9 @@ 1562 USB 2.0 Host Controller 3400 SmartPCI56(UCB1500) 56K Modem 7130 SAA7130 Video Broadcast Decoder + 5168 0138 LiveView FlyVideo 2000 7133 SAA7133 Audio+video broadcast decoder + 5168 0138 LifeView FlyVideo 3000 # PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl) 7134 SAA7134 7135 SAA7135 Audio+video broadcast decoder @@ -3275,7 +3454,8 @@ 11bd 0006 DV500 Overlay 11bd 000a DV500 Overlay 1132 Mitel Corp. -1133 Eicon Technology Corporation +# This is the new official company name. See disclaimer on www.eicon.com for details! +1133 Eicon Networks Corporation 7901 EiconCard S90 7902 EiconCard S90 7911 EiconCard S91 @@ -3287,24 +3467,59 @@ b921 EiconCard P92 b922 EiconCard P92 b923 EiconCard P92 - e001 DIVA 20PRO - 1133 e001 DIVA Pro 2.0 S/T - e002 DIVA 20 - 1133 e002 DIVA 2.0 S/T - e003 DIVA 20PRO_U - 1133 e003 DIVA Pro 2.0 U - e004 DIVA 20_U - 1133 e004 DIVA 2.0 U - e005 DIVA LOW - 1133 e005 DIVA 2.01 S/T - e00b DIVA 2.02 - e010 DIVA Server BRI-2M - 1133 e010 DIVA Server BRI-2M - e012 DIVA Server BRI-8M - 1133 e012 DIVA Server BRI-8M - e014 DIVA Server PRI-30M - 1133 e014 DIVA Server PRI-30M - e018 DIVA Server BRI-2M/-2F + e001 Diva Pro 2.0 S/T + e002 Diva 2.0 S/T PCI + e003 Diva Pro 2.0 U + e004 Diva 2.0 U PCI + e005 Diva 2.01 S/T PCI + e006 Diva CT S/T PCI + e007 Diva CT U PCI + e008 Diva CT Lite S/T PCI + e009 Diva CT Lite U PCI + e00a Diva ISDN+V.90 PCI + e00b Diva 2.02 PCI S/T + e00c Diva 2.02 PCI U + e00d Diva ISDN Pro 3.0 PCI + e00e Diva ISDN+CT S/T PCI Rev 2 + e010 Diva Server BRI-2M PCI + 110a 0021 Fujitsu Siemens ISDN S0 + 8001 0014 Diva Server BRI-2M PCI Cornet NQ + e011 Diva Server BRI S/T Rev 2 + e012 Diva Server 4BRI-8M PCI + 8001 0014 Diva Server 4BRI-8M PCI Cornet NQ + e013 Diva Server 4BRI-8M Rev 2 + 8001 0014 Diva Server 4BRI-8M Cornet NQ 2 + e014 Diva Server PRI-30M PCI + 0008 0100 Diva Server PRI-30M PCI + 8001 0014 Diva Server PRI-30M PCI Cornet NQ + e015 DIVA Server PRI-30M 2.0 + 8001 0014 Diva Server PRI Cornet NQ 2 + e016 Diva Server Voice 4BRI PCI + 8001 0014 Diva Server PRI Cornet NQ + e017 Diva Server Voice 4BRI PCI Rev 2 + 8001 0014 Diva Server Voice 4BRI PCI Cornet NQ 2 + e018 Diva Server BRI 2M Revision 2 + 8001 0014 Diva Server BRI 2M Cornet NQ 2 + e019 Diva Server Voice PRI PCI Rev 2 + 8001 0014 Diva Server Voice PRI PCI Cornet NQ 2 + e01a Diva Server 2FX + e01b Diva Server BRI-2M Voice Revision 2 + 8001 0014 Diva Server BRI-2M Voice Cornet NQ 2 + e01c Diva Server PRI Rev 3.0 + 1133 1c01 Diva Server PRI/E1/T1-8 Rev 3.0 + 1133 1c02 Diva Server PRI/T1-24 Rev 3.0 + 1133 1c03 Diva Server PRI/E1-30 Rev 3.0 + 1133 1c04 Diva Server V-PRI/E1/T1 Rev 3.0 + 1133 1c05 Diva Server V-PRI/T1-24 Rev 3.0 + 1133 1c06 Diva Server V-PRI/E1-30 Rev 3.0 + 1133 1c07 Diva Server PRI/E1/T1-8 Cornet NQ 3 + 1133 1c08 Diva Server PRI/T1-24 Cornet NQ 3 + 1133 1c09 Diva Server PRI/E1-30 Cornet NQ 3 + 1133 1c0a Diva Server V-PRI/E1/T1 Cornet NQ 3 + 1133 1c0b Diva Server V-PRI/T1-24 Cornet NQ 3 + 1133 1c0c Diva Server V-PRI/E1-30 Cornet NQ 3 + e01e Diva Server 2PRI + e020 Diva Server 4PRI 1134 Mercury Computer Systems 0001 Raceway Bridge 1135 Fuji Xerox Co Ltd @@ -3527,14 +3742,20 @@ 0017 GCNB-LE Host Bridge 0200 OSB4 South Bridge 0201 CSB5 South Bridge + 4c53 1080 CT8 mainboard 0203 CSB6 South Bridge 0211 OSB4 IDE Controller 0212 CSB5 IDE Controller + 4c53 1080 CT8 mainboard 0213 CSB6 RAID/IDE Controller 0220 OSB4/CSB5 OHCI USB Controller + 4c53 1080 CT8 mainboard 0221 CSB6 OHCI USB Controller 0225 GCLE Host Bridge +# cancelled + 4c53 1080 CT8 mainboard 0227 GCLE-2 Host Bridge + 4c53 1080 CT8 mainboard 1167 Mutoh Industries Inc 1168 Thine Electronics Inc 1169 Centre for Development of Advanced Computing @@ -3816,6 +4037,7 @@ 044e LT WinModem 044f V90 WildWire Modem 0450 LT WinModem + 1033 80a8 Versa Note Vxi 144f 4005 Magnia SG20 0451 LT WinModem 0452 LT WinModem @@ -4123,6 +4345,8 @@ 1242 6562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter 1242 656a FCX-6562 PCI-X Fibre Channel Adapter 4643 FCI-1063 Fibre Channel Adapter + 6562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter + 656a FCX-6562 PCI-X Fibre Channel Adapter 1243 Delphax 1244 AVM Audiovisuelles MKTG & Computer System GmbH 0700 B1 ISDN @@ -4183,7 +4407,7 @@ 1014 0166 ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard 125d 8888 Solo-1 Audio Adapter 1978 ES1978 Maestro 2E - 0e11 b112 Armada M700 + 0e11 b112 Armada M700/E500 1033 803c ES1978 Maestro-2E Audiodrive 1033 8058 ES1978 Maestro-2E Audiodrive 1092 4000 Monster Sound MX400 @@ -4194,6 +4418,7 @@ 1989 ESS Modem 125d 1989 ESS Modem 1998 ES1983S Maestro-3i PCI Audio Accelerator + 1028 00b1 Latitude C600 1028 00e6 ES1983S Maestro-3i (Dell Inspiron 8100) 1999 ES1983S Maestro-3i PCI Modem Accelerator 199a ES1983S Maestro-3i PCI Audio Accelerator @@ -4244,6 +4469,7 @@ 0710 SM710 LynxEM 0712 SM712 LynxEM+ 0720 SM720 Lynx3DM + 0730 SM731 Cougar3DR 0810 SM810 LynxE 0811 SM811 LynxE 0820 SM820 Lynx3D @@ -4532,7 +4758,7 @@ 12b6 Natural Microsystems 12b7 Cognex Modular Vision Systems Div. - Acumen Inc. 12b8 Korg -12b9 US Robotics/3Com +12b9 5610 56K FaxModem 1006 WinModem 12b9 005c USR 56k Internal Voice WinModem (Model 3472) 12b9 005e USR 56k Internal WinModem (Models 662975) @@ -4628,6 +4854,7 @@ 12dc Symicron Computer Communication Ltd. 12dd Management Graphics 12de Rainbow Technologies + 0200 CryptoSwift CS200 12df SBS Technologies Inc 12e0 Chase Research 0010 ST16C654 Quad UART @@ -4826,6 +5053,10 @@ 132d Integrated Silicon Solution, Inc. 1330 MMC Networks 1331 Radisys Corp. + 8200 82600 Host Bridge + 8201 82600 IDE + 8202 82600 USB + 8210 82600 PCI Bridge 1332 Micro Memory 5415 MM-5415CN PCI Memory Module with Battery Backup 5425 MM-5425CN PCI 64/66 Memory Module with Battery Backup @@ -4854,6 +5085,7 @@ 134c Chori Joho System Co. Ltd 134d PCTel Inc 7890 HSP MicroModem 56 + 134d 0001 PCT789 adapter 7891 HSP MicroModem 56 134d 0001 HSP MicroModem 56 7892 HSP MicroModem 56 @@ -4913,6 +5145,7 @@ 1369 Digigram 136a High Soft Tech 136b Kawasaki Steel Corporation + ff01 KL5A72002 Motion JPEG 136c Adtek System Science Co Ltd 136d Gigalabs Inc 136f Applied Magic Inc @@ -5025,7 +5258,10 @@ 13be Miroku Jyoho Service Co. Ltd 13bf Sharewave Inc 13c0 Microgate Corporation - 0010 SyncLink WAN Adapter + 0010 SyncLink Adapter v1 + 0020 SyncLink SCC Adapter + 0030 SyncLink Multiport Adapter + 0210 SyncLink Adapter v2 13c1 3ware Inc 1000 3ware ATA-RAID 1001 3ware 7000-series ATA-RAID @@ -5097,6 +5333,7 @@ 13f6 0101 CMI8338-031 PCI Audio Device 0111 CM8738 1019 0970 P6STP-FL motherboard + 1043 8035 CUSI-FX motherboard 1043 8077 CMI8738 6-channel audio controller 1043 80e2 CMI8738 6ch-MX 13f6 0111 CMI8738/C3DX PCI Audio Device @@ -5171,6 +5408,8 @@ 141e Fanuc Ltd 141f Visiontech Ltd 1420 Psion Dacom plc + 8002 Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part) + 8003 Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part) 1421 Ads Technologies Inc 1422 Ygrec Systems Co Ltd 1423 Custom Technology Corp. @@ -5515,6 +5754,7 @@ 4212 BCM4212 v.90 56k modem 4301 BCM4301 802.11b 4320 BCM94306 802.11g + 1737 4320 WPC54G 4401 BCM4401 100Base-T 1043 80a8 A7V8X motherboard 4402 BCM4402 Integrated 10/100BaseT @@ -5682,7 +5922,9 @@ 14f9 AG COMMUNICATIONS 14fa WANDEL & GOCHERMANN 14fb TRANSAS MARINE (UK) Ltd -14fc QUADRICS Supercomputers World +14fc Quadrics Ltd + 0000 QsNet Elan3 Network Adapter + 0001 QsNetII Elan4 Network Adapter 14fd JAPAN Computer Industry Inc 14fe ARCHTEK TELECOM Corp 14ff TWINHEAD INTERNATIONAL Corp @@ -6038,9 +6280,14 @@ 16be Creatix Polymedia GmbH 16ca CENATEK Inc 0001 Rocket Drive DL +16cd Densitron Technologies +# www.pikatechnologies.com +16df PIKA Technologies Inc. 16ec U.S. Robotics 3685 Wireless Access PCI Adapter Model 022415 16f6 VideoTele.com, Inc. +# www.internetmachines.com +1702 Internet Machines Corporation (IMC) 1705 Digital First, Inc. 170b NetOctave Inc 170c YottaYotta Inc. @@ -6079,6 +6326,9 @@ 0601 VSM2 dual PMC carrier 0710 VS14x series PowerPC PCI board 0720 VS24x series PowerPC PCI board +# found e.g. on KNC DVB-S card +1894 KNC One +18fb Resilience Corporation 1a08 Sierra semiconductor 0000 SC15064 1b13 Jaton Corp @@ -6110,7 +6360,11 @@ 3388 Hint Corp 0013 HiNT HC4 PCI to ISDN bridge, Multimedia audio controller 0014 HiNT HC4 PCI to ISDN bridge, Network controller - 0021 HB1-SE33 PCI-PCI Bridge + 0020 HB6 Universal PCI-PCI bridge (transparent mode) + 0021 HB6 Universal PCI-PCI bridge (non-transparent mode) + 4c53 1050 CT7 mainboard + 4c53 1080 CT8 mainboard + 4c53 3010 PPCI mezzanine (32-bit PMC) 101a E.Band [AudioTrak Inca88] 101b E.Band [AudioTrak Inca88] 8011 VXPro II Chipset @@ -6168,6 +6422,7 @@ 4033 Addtron Technology Co, Inc. 1360 RTL8139 Ethernet 4143 Digital Equipment Corp +4144 Alpha Data 416c Aladdin Knowledge Systems 0100 AladdinCARD 0200 CPC @@ -6365,6 +6620,7 @@ 0003 TURBOstor HFP-832 [HiPPI NIC] 5654 VoiceTronix Pty Ltd 5700 Netpower +5851 Exacq Technologies 6356 UltraStor 6374 c't Magazin für Computertechnik 6773 GPPCI @@ -6383,6 +6639,10 @@ 0008 Extended Express System Support Controller 0039 21145 0122 82437FX + 0326 PCI Bridge Hub I/OxAPIC Interrupt Controller A + 0327 PCI Bridge Hub I/OxAPIC Interrupt Controller B + 0329 PCI Bridge Hub A + 032a PCI Bridge Hub B 0482 82375EB 0483 82424ZX [Saturn] 0484 82378IB [SIO ISA Bridge] @@ -6435,7 +6695,18 @@ 8086 1002 PRO/1000 MF Server Adapter 1012 82546EB Gigabit Ethernet Controller (Fiber) 8086 1012 PRO/1000 MF Dual Port Server Adapter + 1013 82541EI Gigabit Ethernet Controller (Copper) + 1014 82541ER Gigabit Ethernet Controller 1015 82540EM Gigabit Ethernet Controller (LOM) + 1016 82540EP Gigabit Ethernet Controller (LOM) + 1017 82540EP Gigabit Ethernet Controller (LOM) +# Update controller name from 82541EP to 82541EI + 1018 82541EI Gigabit Ethernet Controller + 1019 82547EI Gigabit Ethernet Controller (LOM) + 101e 82540EP Gigabit Ethernet Controller (Mobile) + 1026 82545GM Gigabit Ethernet Controller + 1027 82545GM Gigabit Ethernet Controller + 1028 82545GM Gigabit Ethernet Controller 1029 82559 Ethernet Controller 1030 82559 InBusiness 10/100 1031 82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller @@ -6463,7 +6734,21 @@ 1040 536EP Data Fax Modem 16be 1040 V.9X DSP Data Fax Modem 1043 PRO/Wireless LAN 2100 3B Mini PCI Adapter + 1048 Intel(R) PRO/10GbE LR Server Adapter 1059 82551QM Ethernet Controller +# Updated controller name from 82547EI to 82547GI + 1075 82547GI Gigabit Ethernet Controller +# Updated controller name from 82541EI to 82541GI + 1076 82541GI Gigabit Ethernet Controller +# Update controller name from 82541EI to 82541GI + 1077 82541GI Gigabit Ethernet Controller + 1078 82541EI Gigabit Ethernet Controller +# Update from mistaken ID of 82546EB + 1079 82546GB Gigabit Ethernet Controller +# Update from mistaken ID of 82546EB + 107a 82546GB Gigabit Ethernet Controller +# Update from mistaken ID of 82546EB + 107b 82546GB Gigabit Ethernet Controller 1130 82815 815 Chipset Host Bridge and Memory Controller Hub 1025 1016 Travelmate 612 TX 1043 8027 TUSL2-C Mainboard @@ -6865,6 +7150,7 @@ 24dc 82801EB LPC Interface Controller 24dd 82801EB USB2 24de 82801EB USB + 24df 82801EB (ICH5R) SATA (cc=RAID) 2500 82820 820 (Camino) Chipset Host Bridge (MCH) 1028 0095 Precision Workstation 220 Chipset 1043 801c P3C-2000 system chipset @@ -6905,12 +7191,26 @@ 2571 82865G/PE/P Processor to AGP Controller 2572 82865G Integrated Graphics Device 2573 82865G/PE/P Processor to PCI to CSA Bridge - 2576 82864G/PE/P Processor to I/O Memory Interface + 2576 82865G/PE/P Processor to I/O Memory Interface 2578 82875P Memory Controller Hub 2579 82875P Processor to AGP Controller 257b 82875P Processor to PCI to CSA Bridge 257e 82875P Processor to I/O Memory Interface + 25a1 Enterprise Southbridge ISA Bridge + 25a2 Enterprise Southbridge PATA + 25a3 Enterprise Southbridge SATA cc=IDE + 25a4 Enterprise Southbridge SMBUS + 25a6 Enterprise Southbridge AC'97 Audio + 25a7 Enterprise Southbridge AC'97 Modem + 25a9 Enterprise Southbridge USB 1.1 UHCI + 25aa Enterprise Southbridge USB 1.1 UHCI + 25ab Enterprise Southbridge Watchdog Timer + 25ac Enterprise Southbridge IOxAPIC + 25ad Enterprise Southbridge USB 2.0 EHCI + 25ae Enterprise Southbridge Hublink PCI-X Bridge + 25b0 Enterprise Southbridge SATA cc=RAID 3092 Integrated RAID + 3200 GD31244 PCI-X SATA HBA 3340 82855PM Processor to I/O Controller 3341 82855PM Processor to AGP Controller 3575 82830 830 Chipset Host Bridge @@ -6922,6 +7222,18 @@ 3578 82830 830 Chipset Host Bridge 3580 82852/855GM Host Bridge 3582 82852/855GM Integrated Graphics Device + 3590 Server Memory Controller Hub + 3591 Memory Controller Hub Error Reporting Register + 3592 Server Memory Controller Hub + 3594 Memory Controller Hub DMA Controller + 3595 Memory Controller Hub PCI Express Port A0 + 3596 Memory Controller Hub PCI Express Port A1 + 3597 Memory Controller Hub PCI Express Port B0 + 3598 Memory Controller Hub PCI Express Port B1 + 3599 Memory Controller Hub PCI Express Port C0 + 359a Memory Controller Hub PCI Express Port C1 + 359b Memory Controller Hub Extended Configuration Registers + 359e Workstation Memory Controller Hub 5200 EtherExpress PRO/100 Intelligent Server 5201 EtherExpress PRO/100 Intelligent Server 8086 0001 EtherExpress PRO/100 Server Ethernet Adapter @@ -7227,12 +7539,15 @@ d84d Exsys dead Indigita Corporation e000 Winbond e000 W89C940 -e159 Tiger Jet Network Inc. +# see : http://www.schoenfeld.de/inside/Inside_CWMK3.txt +e159 Individual Computers - Jens Schoenfeld 0001 Intel 537 0059 0001 128k ISDN-S/T Adapter 0059 0003 128k ISDN-U Adapter 0002 Tiger100APC ISDN chipset e4bf EKF Elektronik GmbH +# Innovative and scalable network IC vendor +e55e Essence Technology, Inc. ea01 Eagle Technology # The main chip of all these devices is by Xilinx -> It could also be a Xilinx ID. ea60 RME @@ -7277,6 +7592,8 @@ febd Ultraview Corp. feda Broadcom Inc (nee Epigram) a0fa BCM4210 iLine10 HomePNA 2.0 a10e BCM4230 iLine10 HomePNA 2.0 +# IT & Telecom company, develops PCI Trunk cards <www.fedetec.es> +fede Fedetec Inc. fffe VMWare Inc 0710 Virtual SVGA ffff Illegal Vendor ID diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index ff8f3d14a..d1b3b3487 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.14 2003/10/30 15:26:34 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.1.4.2 2003/12/20 00:28:30 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.15 2003/12/18 16:32:45 dawes Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT @@ -171,6 +172,12 @@ static const char pci_subsys_1000_000f_1092_8760[] = "FirePort 40 Dual SCSI Cont #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_000f_1de1_3904[] = "DC390F Ultra Wide SCSI Controller"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_000f_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_000f_4c53_1050[] = "CT7 mainboard"; +#endif static const char pci_device_1000_0010[] = "53c895"; #endif #ifdef INIT_SUBSYS_INFO @@ -189,6 +196,15 @@ static const char pci_device_1000_0020[] = "53c1010 Ultra3 SCSI Adapter"; static const char pci_subsys_1000_0020_1de1_1020[] = "DC-390U3W"; #endif static const char pci_device_1000_0021[] = "53c1010 66MHz Ultra3 SCSI Adapter"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0021_4c53_1080[] = "CT8 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0021_4c53_1300[] = "P017 mezzanine (32-bit PMC)"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0021_4c53_1310[] = "P017 mezzanine (64-bit PMC)"; +#endif static const char pci_device_1000_0030[] = "53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI"; #endif #ifdef INIT_SUBSYS_INFO @@ -259,6 +275,7 @@ static const char pci_device_1002_4145[] = "Radeon R300 AE [Radeon 9500 Pro]"; static const char pci_device_1002_4146[] = "Radeon R300 AF [Radeon 9500 Pro]"; static const char pci_device_1002_4147[] = "Radeon R300 AG [FireGL Z1/X1]"; static const char pci_device_1002_4158[] = "68800AX [Mach32]"; +static const char pci_device_1002_4164[] = "Radeon R300 Secondary (DVI) output"; static const char pci_device_1002_4242[] = "Radeon R200 BB [Radeon All in Wonder 8500DV]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4242_1002_02aa[] = "Radeon 8500 AIW DV Edition"; @@ -386,6 +403,9 @@ static const char pci_subsys_1002_4752_1002_4752[] = "Rage XL"; static const char pci_subsys_1002_4752_1002_8008[] = "Rage XL"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4752_1028_00ce[] = "PowerEdge 1400"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4752_1028_00d1[] = "PowerEdge 2550"; #endif static const char pci_device_1002_4753[] = "Rage XC"; @@ -477,6 +497,9 @@ static const char pci_subsys_1002_4c42_1028_0085[] = "Rage 3D LT Pro"; static const char pci_device_1002_4c44[] = "3D Rage LT Pro AGP-66"; static const char pci_device_1002_4c45[] = "Rage Mobility M3 AGP"; static const char pci_device_1002_4c46[] = "Rage Mobility M3 AGP 2x"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4c46_1028_00b1[] = "Latitude C600"; +#endif static const char pci_device_1002_4c47[] = "3D Rage LT-G 215LG"; static const char pci_device_1002_4c49[] = "3D Rage LT Pro"; #ifdef INIT_SUBSYS_INFO @@ -496,11 +519,17 @@ static const char pci_device_1002_4c4d[] = "Rage Mobility P/M AGP 2x"; static const char pci_subsys_1002_4c4d_0e11_b111[] = "Armada M700"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4c4d_0e11_b160[] = "Armada E500"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4c4d_1002_0084[] = "Xpert 98 AGP 2X (Mobility)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4c4d_1014_0154[] = "ThinkPad A20m"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4c4d_1028_00aa[] = "Latitude CPt"; +#endif static const char pci_device_1002_4c4e[] = "Rage Mobility L AGP 2x"; static const char pci_device_1002_4c50[] = "3D Rage LT Pro"; #ifdef INIT_SUBSYS_INFO @@ -536,6 +565,7 @@ static const char pci_device_1002_4c64[] = "Radeon R250 Ld [Radeon Mobility 9000 static const char pci_device_1002_4c65[] = "Radeon R250 Le [Radeon Mobility 9000 M9]"; static const char pci_device_1002_4c66[] = "Radeon R250 Lf [Radeon Mobility 9000 M9]"; static const char pci_device_1002_4c67[] = "Radeon R250 Lg [Radeon Mobility 9000 M9]"; +static const char pci_device_1002_4c6e[] = "Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]"; static const char pci_device_1002_4d46[] = "Rage Mobility M4 AGP"; static const char pci_device_1002_4d4c[] = "Rage Mobility M4 AGP"; static const char pci_device_1002_4e44[] = "Radeon R300 ND [Radeon 9700 Pro]"; @@ -548,6 +578,9 @@ static const char pci_device_1002_4e47[] = "Radeon R300 NG [FireGL X1]"; static const char pci_device_1002_4e48[] = "Radeon R350 [Radeon 9800]"; static const char pci_device_1002_4e64[] = "Radeon R300 [Radeon 9700 Pro] (Secondary)"; static const char pci_device_1002_4e65[] = "Radeon R300 [Radeon 9500 Pro] (Secondary)"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4e65_1002_0003[] = "Radeon R300 NE [Radeon 9500 Pro]"; +#endif static const char pci_device_1002_4e66[] = "Radeon R300 [Radeon 9700] (Secondary)"; static const char pci_device_1002_4e67[] = "Radeon R300 [FireGL X1] (Secondary)"; static const char pci_device_1002_4e68[] = "Radeon R350 [Radeon 9800] (Secondary)"; @@ -856,8 +889,10 @@ static const char pci_subsys_1002_5654_1002_5654[] = "Mach64VT Reference"; #endif static const char pci_device_1002_5655[] = "264VT3 [Mach64 VT3]"; static const char pci_device_1002_5656[] = "264VT4 [Mach64 VT4]"; +static const char pci_device_1002_5961[] = "Radeon RV280 [Radeon 9200]"; static const char pci_device_1002_700f[] = "PCI Bridge [IGP 320M]"; static const char pci_device_1002_7010[] = "PCI Bridge [IGP 340M]"; +static const char pci_device_1002_cab0[] = "AGP Bridge [IGP 320M]"; static const char pci_device_1002_cab2[] = "RS200/RS200M AGP Bridge [IGP 340M]"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1003[] = "ULSI Systems"; @@ -942,7 +977,16 @@ static const char pci_device_100b_000f[] = "FireWire Controller"; static const char pci_device_100b_0011[] = "NS87560 National PCI System I/O"; static const char pci_device_100b_0012[] = "USB Controller"; static const char pci_device_100b_0020[] = "DP83815 (MacPhyter) Ethernet Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0020_1385_f311[] = "FA311 / FA312 (FA311 with WoL HW)"; +#endif static const char pci_device_100b_0022[] = "DP83820 10/100/1000 Ethernet Controller"; +static const char pci_device_100b_0028[] = "CS5535 Host bridge"; +static const char pci_device_100b_002b[] = "CS5535 ISA bridge"; +static const char pci_device_100b_002d[] = "CS5535 IDE"; +static const char pci_device_100b_002e[] = "CS5535 Audio"; +static const char pci_device_100b_002f[] = "CS5535 USB"; +static const char pci_device_100b_0030[] = "CS5535 Video"; static const char pci_device_100b_0500[] = "SCx200 Bridge"; static const char pci_device_100b_0501[] = "SCx200 SMI"; static const char pci_device_100b_0502[] = "SCx200 IDE"; @@ -1159,7 +1203,13 @@ static const char pci_subsys_1011_0046_0e11_4058[] = "Integrated Smart Array"; static const char pci_subsys_1011_0046_103c_10c2[] = "Hewlett-Packard NetRAID-4M"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1011_0046_12d9_000a[] = "VoIP PCI Gateway"; +static const char pci_subsys_1011_0046_12d9_000a[] = "IP Telephony card"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1011_0046_4c53_1050[] = "CT7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1011_0046_4c53_1051[] = "CE7 mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1011_0046_9005_0365[] = "Adaptec 5400S"; @@ -1272,18 +1322,20 @@ static const char pci_device_1014_0018[] = "TR Auto LANstreamer"; static const char pci_device_1014_001b[] = "GXT-150P"; static const char pci_device_1014_001c[] = "Carrera"; static const char pci_device_1014_001d[] = "82G2675"; -static const char pci_device_1014_0020[] = "MCA"; +static const char pci_device_1014_0020[] = "GXT1000 Graphics Adapter"; static const char pci_device_1014_0022[] = "IBM27-82351"; static const char pci_device_1014_002d[] = "Python"; -static const char pci_device_1014_002e[] = "ServeRAID Controller"; +static const char pci_device_1014_002e[] = "SCSI RAID Adapter [ServeRAID]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_002e_1014_002e[] = "ServeRAID-3x"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_002e_1014_022e[] = "ServeRAID-4H"; #endif +static const char pci_device_1014_0031[] = "2 Port Serial Adapter"; static const char pci_device_1014_0036[] = "Miami"; static const char pci_device_1014_003a[] = "CPU to PCI Bridge"; +static const char pci_device_1014_003c[] = "GXT250P/GXT255P Graphics Adapter"; static const char pci_device_1014_003e[] = "16/4 Token ring UTP/STP controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_003e_1014_003e[] = "Token-Ring Adapter"; @@ -1315,14 +1367,18 @@ static const char pci_device_1014_004e[] = "ATM Controller (14104e00)"; static const char pci_device_1014_004f[] = "ATM Controller (14104f00)"; static const char pci_device_1014_0050[] = "ATM Controller (14105000)"; static const char pci_device_1014_0053[] = "25 MBit ATM Controller"; +static const char pci_device_1014_0054[] = "GXT500P/GXT550P Graphics Adapter"; static const char pci_device_1014_0057[] = "MPEG PCI Bridge"; static const char pci_device_1014_005c[] = "i82557B 10/100"; +static const char pci_device_1014_005e[] = "GXT800P Graphics Adapter"; static const char pci_device_1014_007c[] = "ATM Controller (14107c00)"; static const char pci_device_1014_007d[] = "3780IDSP [MWave]"; +static const char pci_device_1014_008e[] = "GXT3000P Graphics Adapter"; static const char pci_device_1014_0090[] = "GXT 3000P"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_0090_1014_008e[] = "GXT-3000P"; #endif +static const char pci_device_1014_0091[] = "SSA Adapter"; static const char pci_device_1014_0095[] = "20H2999 PCI Docking Bridge"; static const char pci_device_1014_0096[] = "Chukar chipset SCSI controller"; #ifdef INIT_SUBSYS_INFO @@ -1334,12 +1390,15 @@ static const char pci_subsys_1014_0096_1014_0098[] = "iSeries 2763 DASD IOA"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_0096_1014_0099[] = "iSeries 2748 DASD IOA"; #endif +static const char pci_device_1014_009f[] = "PCI 4758 Cryptographic Accelerator"; static const char pci_device_1014_00a5[] = "ATM Controller (1410a500)"; static const char pci_device_1014_00a6[] = "ATM 155MBPS MM Controller (1410a600)"; static const char pci_device_1014_00b7[] = "256-bit Graphics Rasterizer [Fire GL1]"; +static const char pci_device_1014_00b8[] = "GXT2000P Graphics Adapter"; static const char pci_device_1014_00be[] = "ATM 622MBPS Controller (1410be00)"; static const char pci_device_1014_00dc[] = "Advanced Systems Management Adapter (ASMA)"; static const char pci_device_1014_00fc[] = "CPC710 Dual Bridge and Memory Controller (PCI-64)"; +static const char pci_device_1014_0104[] = "Gigabit Ethernet-SX Adapter"; static const char pci_device_1014_0105[] = "CPC710 Dual Bridge and Memory Controller (PCI-32)"; static const char pci_device_1014_010f[] = "Remote Supervisor Adapter (RSA)"; static const char pci_device_1014_0142[] = "Yotta Video Compositor Input"; @@ -1351,6 +1410,18 @@ static const char pci_device_1014_0144[] = "Yotta Video Compositor Output"; static const char pci_subsys_1014_0144_1014_0145[] = "Yotta Output Controller (ytout)"; #endif static const char pci_device_1014_0156[] = "405GP PLB to PCI Bridge"; +static const char pci_device_1014_015e[] = "622Mbps ATM PCI Adapter"; +static const char pci_device_1014_0160[] = "64bit/66MHz PCI ATM 155 MMF"; +static const char pci_device_1014_016e[] = "GXT4000P Graphics Adapter"; +static const char pci_device_1014_0170[] = "GXT6000P Graphics Adapter"; +static const char pci_device_1014_017d[] = "GXT300P Graphics Adapter"; +static const char pci_device_1014_0180[] = "Snipe chipset SCSI controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0180_1014_0241[] = "iSeries 2757 DASD IOA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0180_1014_0264[] = "Quad Channel PCI-X U320 SCSI RAID Adapter (2780)"; +#endif static const char pci_device_1014_01a7[] = "PCI-X to PCI-X Bridge"; static const char pci_device_1014_01bd[] = "ServeRAID Controller"; #ifdef INIT_SUBSYS_INFO @@ -1374,6 +1445,25 @@ static const char pci_subsys_1014_01bd_1014_0258[] = "ServeRAID-5i"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_01bd_1014_0259[] = "ServeRAID-5i"; #endif +static const char pci_device_1014_01c1[] = "64bit/66MHz PCI ATM 155 UTP"; +static const char pci_device_1014_01e6[] = "Cryptographic Accelerator"; +static const char pci_device_1014_01ff[] = "10/100 Mbps Ethernet"; +static const char pci_device_1014_0219[] = "Multiport Serial Adapter"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0219_1014_021a[] = "Dual RVX"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0219_1014_0251[] = "Internal Modem/RVX"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0219_1014_0252[] = "Quad Internal Modem"; +#endif +static const char pci_device_1014_021b[] = "GXT6500P Graphics Adapter"; +static const char pci_device_1014_021c[] = "GXT4500P Graphics Adapter"; +static const char pci_device_1014_0233[] = "GXT135P Graphics Adapter"; +static const char pci_device_1014_0266[] = "PCI-X Dual Channel SCSI"; +static const char pci_device_1014_0268[] = "Gigabit Ethernet-SX Adapter (PCI-X)"; +static const char pci_device_1014_0269[] = "10/100/1000 Base-TX Ethernet Adapter (PCI-X)"; static const char pci_device_1014_0302[] = "XA-32 chipset [Summit]"; static const char pci_device_1014_ffff[] = "MPIC-2 interrupt controller"; #endif @@ -1509,6 +1599,24 @@ static const char pci_subsys_1022_2000_1259_2700[] = "AT-2700TX 10/100 Fast Ethe #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1022_2000_1259_2701[] = "AT-2700FX 100Mb Ethernet"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1010[] = "CP5/CR6 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1020[] = "VR6 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1030[] = "PC5 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1040[] = "CL7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1022_2000_4c53_1060[] = "PC7 mainboard"; +#endif static const char pci_device_1022_2001[] = "79c978 [HomePNA]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1022_2001_1092_0a78[] = "Multimedia Home Network Adapter"; @@ -1516,6 +1624,7 @@ static const char pci_subsys_1022_2001_1092_0a78[] = "Multimedia Home Network Ad #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1022_2001_1668_0299[] = "ActionLink Home Network Adapter"; #endif +static const char pci_device_1022_2003[] = "Am 1771 MBW [Alchemy]"; static const char pci_device_1022_2020[] = "53c974 [PCscsi]"; static const char pci_device_1022_2040[] = "79c974"; static const char pci_device_1022_3000[] = "ELanSC520 Microcontroller"; @@ -1564,6 +1673,7 @@ static const char pci_device_1022_746a[] = "AMD-8111 SMBus 2.0"; static const char pci_device_1022_746b[] = "AMD-8111 ACPI"; static const char pci_device_1022_746d[] = "AMD-8111 AC97 Audio"; static const char pci_device_1022_746e[] = "AMD-8111 MC97 Modem"; +static const char pci_device_1022_756b[] = "AMD-8111 ACPI"; static const char pci_vendor_1023[] = "Trident Microsystems"; static const char pci_device_1023_0194[] = "82C194"; static const char pci_device_1023_2000[] = "4DWave DX"; @@ -2097,6 +2207,24 @@ static const char pci_device_102c_00c0[] = "F69000 HiQVideo"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_102c_00c0_102c_00c0[] = "F69000 HiQVideo"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1010[] = "CP5/CR6 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1020[] = "VR6 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1030[] = "PC5 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1050[] = "CT7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_00c0_4c53_1051[] = "CE7 mainboard"; +#endif static const char pci_device_102c_00d0[] = "F65545"; static const char pci_device_102c_00d8[] = "F65545"; static const char pci_device_102c_00dc[] = "F65548"; @@ -2110,6 +2238,18 @@ static const char pci_device_102c_00f0[] = "F68554"; static const char pci_device_102c_00f4[] = "F68554 HiQVision"; static const char pci_device_102c_00f5[] = "F68555"; static const char pci_device_102c_0c30[] = "F69030"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_0c30_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_0c30_4c53_1050[] = "CT7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_0c30_4c53_1051[] = "CE7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102c_0c30_4c53_1080[] = "CT8 mainboard"; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_102d[] = "Wyse Technology Inc."; static const char pci_device_102d_50dc[] = "3328 Audio"; @@ -2137,6 +2277,7 @@ static const char pci_device_1031_6057[] = "MiroVideo DC10/DC30+"; static const char pci_vendor_1032[] = "Compaq"; #endif static const char pci_vendor_1033[] = "NEC Corporation"; +static const char pci_device_1033_0000[] = "Vr4181A USB Host or Function Control Unit"; static const char pci_device_1033_0001[] = "PCI to 486-like bus Bridge"; static const char pci_device_1033_0002[] = "PCI to VL98 Bridge"; static const char pci_device_1033_0003[] = "ATM Controller"; @@ -2203,6 +2344,7 @@ static const char pci_device_1033_00cd[] = "IEEE 1394 [OrangeLink] Host Controll #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1033_00cd_12ee_8011[] = "Root hub"; #endif +static const char pci_device_1033_00df[] = "Vr4131"; static const char pci_device_1033_00e0[] = "USB 2.0"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1033_00e0_12ee_7001[] = "Root hub"; @@ -2210,6 +2352,7 @@ static const char pci_subsys_1033_00e0_12ee_7001[] = "Root hub"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1033_00e0_1799_0002[] = "Root Hub"; #endif +static const char pci_device_1033_00f3[] = "uPD6113x Multimedia Decoder/Processor [EMMA2]"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1034[] = "Framatome Connectors USA Inc."; #endif @@ -2267,11 +2410,15 @@ static const char pci_device_1039_0733[] = "733 Host"; static const char pci_device_1039_0735[] = "735 Host"; static const char pci_device_1039_0740[] = "740 Host"; static const char pci_device_1039_0745[] = "745 Host"; +static const char pci_device_1039_0746[] = "746 Host"; static const char pci_device_1039_0755[] = "SiS 755 Host Bridge"; static const char pci_device_1039_0900[] = "SiS900 10/100 Ethernet"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_0900_1039_0900[] = "SiS900 10/100 Ethernet Adapter"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_0900_1043_8035[] = "CUSI-FX motherboard"; +#endif static const char pci_device_1039_0961[] = "SiS961 [MuTIOL Media IO]"; static const char pci_device_1039_0962[] = "SiS962 [MuTIOL Media IO]"; static const char pci_device_1039_3602[] = "83C602"; @@ -2287,6 +2434,9 @@ static const char pci_subsys_1039_5513_1019_0970[] = "P6STP-FL motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_5513_1039_5513[] = "SiS5513 EIDE Controller (A,B step)"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_5513_1043_8035[] = "CUSI-FX motherboard"; +#endif static const char pci_device_1039_5517[] = "5517"; static const char pci_device_1039_5571[] = "5571"; static const char pci_device_1039_5581[] = "5581 Pentium Chipset"; @@ -2302,6 +2452,9 @@ static const char pci_device_1039_6300[] = "SiS630 GUI Accelerator+3D"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_6300_1019_0970[] = "P6STP-FL motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_6300_1043_8035[] = "CUSI-FX motherboard"; +#endif static const char pci_device_1039_6306[] = "SiS530 3D PCI/AGP"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_6306_1039_6306[] = "SiS530,620 GUI Accelerator+3D"; @@ -2408,6 +2561,7 @@ static const char pci_subsys_1039_7018_270f_a171[] = "SiS PCI Audio Accelerator" #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7018_a0a0_0022[] = "SiS PCI Audio Accelerator"; #endif +static const char pci_device_1039_7019[] = "SiS7019 Audio Accelerator"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_103a[] = "Seiko Epson Corporation"; #endif @@ -2516,6 +2670,7 @@ static const char pci_device_1042_3020[] = "Samurai_IDE"; static const char pci_vendor_1043[] = "Asustek Computer, Inc."; static const char pci_device_1043_0675[] = "ISDNLink P-IN100-ST-D"; static const char pci_device_1043_4021[] = "v7100 Combo Deluxe [GeForce2 MX + TV tuner]"; +static const char pci_device_1043_4057[] = "v8200 GeForce 3"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1044[] = "Distributed Processing Technology"; @@ -2651,7 +2806,7 @@ static const char pci_device_1045_c825[] = "82C825 [Firebridge 2]"; static const char pci_device_1045_c832[] = "82C832"; static const char pci_device_1045_c861[] = "82C861"; static const char pci_device_1045_c895[] = "82C895"; -static const char pci_device_1045_c935[] = "EV1935 ECTIVA MachOne PCI Audio"; +static const char pci_device_1045_c935[] = "EV1935 ECTIVA MachOne PCIAudio"; static const char pci_device_1045_d568[] = "82C825 [Firebridge 2]"; static const char pci_device_1045_d721[] = "IDE [FireStar]"; #endif @@ -2670,15 +2825,22 @@ static const char pci_device_1048_3000[] = "QuickStep 3000"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1049[] = "Fountain Technologies, Inc."; #endif -static const char pci_vendor_104a[] = "SGS Thomson Microelectronics"; +static const char pci_vendor_104a[] = "STMicroelectronics"; static const char pci_device_104a_0008[] = "STG 2000X"; static const char pci_device_104a_0009[] = "STG 1764X"; static const char pci_device_104a_0010[] = "STG4000 [3D Prophet Kyro Series]"; +static const char pci_device_104a_0209[] = "STPC Consumer/Industrial North- and Southbridge"; +static const char pci_device_104a_020a[] = "STPC Atlas/ConsumerS/Consumer IIA Northbridge"; static const char pci_device_104a_0210[] = "STPC Atlas ISA Bridge"; +static const char pci_device_104a_021a[] = "STPC Consumer S Southbridge"; +static const char pci_device_104a_021b[] = "STPC Consumer IIA Southbridge"; +static const char pci_device_104a_0500[] = "ST70137 [Unicorn] ADSL DMT Transceiver"; +static const char pci_device_104a_0564[] = "STPC Client Northbridge"; static const char pci_device_104a_0981[] = "DEC-Tulip compatible 10/100 Ethernet"; static const char pci_device_104a_1746[] = "STG 1764X"; static const char pci_device_104a_2774[] = "DEC-Tulip compatible 10/100 Ethernet"; static const char pci_device_104a_3520[] = "MPEG-II decoder card"; +static const char pci_device_104a_55cc[] = "STPC Client Southbridge"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_104b[] = "BusLogic"; static const char pci_device_104b_0140[] = "BT-946C (old) [multimaster 01]"; @@ -2793,7 +2955,10 @@ static const char pci_device_104c_8027[] = "PCI4451 IEEE-1394 Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_104c_8027_1028_00e6[] = "PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)"; #endif +static const char pci_device_104c_8029[] = "PCI4510 IEEE-1394 Controller"; static const char pci_device_104c_8400[] = "ACX 100 22Mbps Wireless Interface"; +static const char pci_device_104c_8401[] = "ACX 100 22Mbps Wireless Interface"; +static const char pci_device_104c_9000[] = "Wireless Interface (of unknown type)"; static const char pci_device_104c_a001[] = "TDC1570"; static const char pci_device_104c_a100[] = "TDC1561"; static const char pci_device_104c_a102[] = "TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f"; @@ -2813,6 +2978,9 @@ static const char pci_device_104c_ac1b[] = "PCI1450"; static const char pci_subsys_104c_ac1b_0e11_b113[] = "Armada M700"; #endif static const char pci_device_104c_ac1c[] = "PCI1225"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_104c_ac1c_0e11_b121[] = "Armada E500"; +#endif static const char pci_device_104c_ac1d[] = "PCI1251A"; static const char pci_device_104c_ac1e[] = "PCI1211"; static const char pci_device_104c_ac1f[] = "PCI1251B"; @@ -2828,12 +2996,16 @@ static const char pci_device_104c_ac42[] = "PCI4451 PC card Cardbus Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_104c_ac42_1028_00e6[] = "PCI4451 PC card CardBus Controller (Dell Inspiron 8100)"; #endif +static const char pci_device_104c_ac44[] = "PCI4510 PC card Cardbus Controller"; static const char pci_device_104c_ac50[] = "PCI1410 PC card Cardbus Controller"; static const char pci_device_104c_ac51[] = "PCI1420"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_104c_ac51_1014_023b[] = "ThinkPad T23 (2647-4MG)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_104c_ac51_1028_00b1[] = "Latitude C600"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_104c_ac51_10cf_1095[] = "Lifebook C6155"; #endif #ifdef INIT_SUBSYS_INFO @@ -2991,6 +3163,7 @@ static const char pci_device_105a_0d38[] = "20263"; static const char pci_subsys_105a_0d38_105a_4d39[] = "Fasttrak66"; #endif static const char pci_device_105a_1275[] = "20275"; +static const char pci_device_105a_3318[] = "PDC20318 (SATA150 TX4)"; static const char pci_device_105a_3376[] = "PDC20376"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_105a_3376_1043_809e[] = "A7V8X motherboard"; @@ -3035,6 +3208,7 @@ static const char pci_device_105a_6269[] = "PDC20271"; static const char pci_subsys_105a_6269_105a_6269[] = "FastTrak TX2/TX2000"; #endif static const char pci_device_105a_6621[] = "PDC20621 [SX4000] 4 Channel IDE RAID Controller"; +static const char pci_device_105a_6629[] = "PDC20619 FastTrak TX4000 RAID"; static const char pci_device_105a_7275[] = "PDC20277"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -3209,6 +3383,7 @@ static const char pci_device_1069_0001[] = "DAC960P"; static const char pci_device_1069_0002[] = "DAC960PD"; static const char pci_device_1069_0010[] = "DAC960PX"; static const char pci_device_1069_0050[] = "AcceleRAID 352/170/160 support Device"; +static const char pci_device_1069_b166[] = "Gemstone chipset SCSI controller"; static const char pci_device_1069_ba55[] = "eXtremeRAID 1100 support Device"; static const char pci_device_1069_ba56[] = "eXtremeRAID 2000/3000 support Device"; #endif @@ -3551,6 +3726,8 @@ static const char pci_device_1093_1180[] = "PCI-MIO-16E-1"; static const char pci_device_1093_1190[] = "PCI-MIO-16E-4"; static const char pci_device_1093_1330[] = "PCI-6031E"; static const char pci_device_1093_1350[] = "PCI-6071E"; +static const char pci_device_1093_17d0[] = "PCI-6503"; +static const char pci_device_1093_2410[] = "PCI-6733"; static const char pci_device_1093_2a60[] = "PCI-6023E"; static const char pci_device_1093_b001[] = "IMAQ-PCI-1408"; static const char pci_device_1093_b011[] = "IMAQ-PXI-1408"; @@ -4167,6 +4344,9 @@ static const char pci_device_10b5_9054[] = "PCI <-> IOBus Bridge"; static const char pci_subsys_10b5_9054_10b5_2455[] = "Wessex Techology PHIL-PCI"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_9054_10b5_2696[] = "Innes Corp AM Radcap card"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_9054_12d9_0002[] = "PCI Prosody Card rev 1.5"; #endif static const char pci_device_10b5_9060[] = "9060"; @@ -4185,6 +4365,7 @@ static const char pci_subsys_10b5_9080_129d_0002[] = "Aculab PCI Prosidy card"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_9080_12d9_0002[] = "PCI Prosody Card"; #endif +static const char pci_device_10b5_bb04[] = "B&B 3PCIOSD1A Isolated PCI Serial"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10b6[] = "Madge Networks"; @@ -4248,6 +4429,7 @@ static const char pci_device_10b7_1007[] = "Mini PCI 56k Winmodem"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b7_1007_10b7_615c[] = "Mini PCI 56K Modem"; #endif +static const char pci_device_10b7_1700[] = "3c940 1000Base?"; static const char pci_device_10b7_3390[] = "3c339 TokenLink Velocity"; static const char pci_device_10b7_3590[] = "3c359 TokenLink Velocity XL"; #ifdef INIT_SUBSYS_INFO @@ -4300,6 +4482,7 @@ static const char pci_subsys_10b7_6563_10b7_656b[] = "3CCFEM656 10/100 LAN+56K M #endif static const char pci_device_10b7_6564[] = "3CCFEM656 [id 6564] Cyclone CardBus"; static const char pci_device_10b7_7646[] = "3cSOHO100-TX Hurricane"; +static const char pci_device_10b7_7770[] = "3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect]"; static const char pci_device_10b7_7940[] = "3c803 FDDILink UTP Controller"; static const char pci_device_10b7_7980[] = "3c804 FDDILink SAS Controller"; static const char pci_device_10b7_7990[] = "3c805 FDDILink DAS Controller"; @@ -4428,7 +4611,12 @@ static const char pci_device_10b7_905a[] = "3c905B-FX [Fast Etherlink XL FX 10/1 static const char pci_device_10b7_9200[] = "3c905C-TX/TX-M [Tornado]"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10b7_9200_1028_0095[] = "Integrated 3C905C-TX Fast Etherlink for PC Management NIC"; +static const char pci_subsys_10b7_9200_1028_0095[] = "3C920 Integrated Fast Ethernet Controller"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b7_9200_1028_0097[] = "3C920 Integrated Fast Ethernet Controller"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO @@ -4783,7 +4971,9 @@ static const char pci_vendor_10ca[] = "Fujitsu Microelectr., Inc."; static const char pci_vendor_10cb[] = "Omron Corporation"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_10cc[] = "Mentor ARC Inc"; +static const char pci_vendor_10cc[] = "Mai Logic Incorporated"; +static const char pci_device_10cc_0660[] = "Articia S Host Bridge"; +static const char pci_device_10cc_0661[] = "Articia S PCI Bridge"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10cd[] = "Advanced System Products, Inc"; @@ -4800,13 +4990,10 @@ static const char pci_device_10cd_2500[] = "ABP940-U2W"; static const char pci_vendor_10ce[] = "Radius"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_10cf[] = "Citicorp TTI"; +static const char pci_vendor_10cf[] = "Fujitsu Limited."; static const char pci_device_10cf_2001[] = "mb86605"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_10d0[] = "Fujitsu Limited"; -#endif -#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10d1[] = "FuturePlus Systems Corp."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -5066,11 +5253,23 @@ static const char pci_subsys_10de_0068_1043_0c11[] = "A7N8X Mainboard"; #endif static const char pci_device_10de_006a[] = "nForce2 AC97 Audio Controler (MCP)"; static const char pci_device_10de_006b[] = "nForce MultiMedia audio [Via VT82C686B]"; +static const char pci_device_10de_006c[] = "nForce2 External PCI Bridge"; +static const char pci_device_10de_006d[] = "nForce2 PCI Bridge"; static const char pci_device_10de_006e[] = "nForce2 FireWire (IEEE 1394) Controller"; static const char pci_device_10de_00a0[] = "NV5 [Aladdin TNT2]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00a0_14af_5810[] = "Maxi Gamer Xentor"; #endif +static const char pci_device_10de_00d0[] = "nForce3 LPC Bridge"; +static const char pci_device_10de_00d1[] = "nForce3 Host Bridge"; +static const char pci_device_10de_00d2[] = "nForce3 AGP Bridge"; +static const char pci_device_10de_00d4[] = "nForce3 SMBus"; +static const char pci_device_10de_00d5[] = "nForce3 IDE"; +static const char pci_device_10de_00d6[] = "nForce3 Ethernet"; +static const char pci_device_10de_00d7[] = "nForce3 USB 1.1"; +static const char pci_device_10de_00d8[] = "nForce3 USB 2.0"; +static const char pci_device_10de_00da[] = "nForce3 Audio"; +static const char pci_device_10de_00dd[] = "nForce3 PCI Bridge"; static const char pci_device_10de_0100[] = "NV10 [GeForce 256 SDR]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0100_1043_0200[] = "AGP-V6600 SGRAM"; @@ -5101,6 +5300,9 @@ static const char pci_subsys_10de_0101_1043_400a[] = "AGP-V6800 DDR SGRAM"; static const char pci_subsys_10de_0101_1043_400b[] = "AGP-V6800 DDR SDRAM"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0101_107d_2822[] = "WinFast GeForce 256"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0101_1102_102e[] = "CT6971 GeForce 256 DDR"; #endif #ifdef INIT_SUBSYS_INFO @@ -5170,12 +5372,18 @@ static const char pci_device_10de_017a[] = "NV17GL [Quadro4 200/400 NVS]"; static const char pci_device_10de_017b[] = "NV17GL [Quadro4 550 XGL]"; static const char pci_device_10de_017c[] = "NV17GL [Quadro4 550 GoGL]"; static const char pci_device_10de_0181[] = "NV18 [GeForce4 MX 440 AGP 8x]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0181_1043_806f[] = "V9180 Magic"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0181_1462_8880[] = "MS-StarForce GeForce4 MX 440 with AGP8X"; +#endif static const char pci_device_10de_0182[] = "NV18 [GeForce4 MX 440SE AGP 8x]"; static const char pci_device_10de_0183[] = "NV18 [GeForce4 MX 420 AGP 8x]"; static const char pci_device_10de_0188[] = "NV18GL [Quadro4 580 XGL]"; -static const char pci_device_10de_018a[] = "NV18GL [Quadro4 NVS]"; +static const char pci_device_10de_018a[] = "NV18GL [Quadro4 NVS AGP 8x]"; static const char pci_device_10de_018b[] = "NV18GL [Quadro4 380 XGL]"; -static const char pci_device_10de_01a0[] = "NV15 [GeForce2 - nForce GPU]"; +static const char pci_device_10de_01a0[] = "NVCrush11 [GeForce2 MX Integrated Graphics]"; static const char pci_device_10de_01a4[] = "nForce CPU bridge"; static const char pci_device_10de_01ab[] = "nForce 420 Memory Controller (DDR)"; static const char pci_device_10de_01ac[] = "nForce 220/420 Memory Controller"; @@ -5189,7 +5397,14 @@ static const char pci_device_10de_01bc[] = "nForce IDE"; static const char pci_device_10de_01c1[] = "Intel 537 [nForce MC97 Modem]"; static const char pci_device_10de_01c2[] = "nForce USB Controller"; static const char pci_device_10de_01c3[] = "nForce Ethernet Controller"; +static const char pci_device_10de_01e0[] = "nForce2 AGP (different version?)"; static const char pci_device_10de_01e8[] = "nForce2 AGP"; +static const char pci_device_10de_01ea[] = "nForce2 Memory Controller 0"; +static const char pci_device_10de_01eb[] = "nForce2 Memory Controller 1"; +static const char pci_device_10de_01ec[] = "nForce2 Memory Controller 2"; +static const char pci_device_10de_01ed[] = "nForce2 Memory Controller 3"; +static const char pci_device_10de_01ee[] = "nForce2 Memory Controller 4"; +static const char pci_device_10de_01ef[] = "nForce2 Memory Controller 5"; static const char pci_device_10de_01f0[] = "NV18 [GeForce4 MX - nForce GPU]"; static const char pci_device_10de_0200[] = "NV20 [GeForce3]"; #ifdef INIT_SUBSYS_INFO @@ -5220,6 +5435,7 @@ static const char pci_device_10de_025b[] = "NV25GL [Quadro4 700 XGL]"; static const char pci_device_10de_0280[] = "NV28 [GeForce4 Ti 4800]"; static const char pci_device_10de_0281[] = "NV28 [GeForce4 Ti 4200 AGP 8x]"; static const char pci_device_10de_0282[] = "NV28 [GeForce4 Ti 4800 SE]"; +static const char pci_device_10de_0286[] = "NV28 [GeForce4 Ti 4200 Go AGP 8x]"; static const char pci_device_10de_0288[] = "NV28GL [Quadro4 980 XGL]"; static const char pci_device_10de_0289[] = "NV28GL [Quadro4 780 XGL]"; static const char pci_device_10de_0300[] = "NV30 [GeForce FX]"; @@ -5227,6 +5443,31 @@ static const char pci_device_10de_0301[] = "NV30 [GeForce FX 5800 Ultra]"; static const char pci_device_10de_0302[] = "NV30 [GeForce FX 5800]"; static const char pci_device_10de_0308[] = "NV30GL [Quadro FX 2000]"; static const char pci_device_10de_0309[] = "NV30GL [Quadro FX 1000]"; +static const char pci_device_10de_0311[] = "NV31 [GeForce FX 5600 Ultra]"; +static const char pci_device_10de_0312[] = "NV31 [GeForce FX 5600]"; +static const char pci_device_10de_0314[] = "GeForce FX 5600SE"; +static const char pci_device_10de_031a[] = "GeForce FX Go5600"; +static const char pci_device_10de_031b[] = "GeForce FX Go5650"; +static const char pci_device_10de_031c[] = "Quadro FX Go700"; +static const char pci_device_10de_0321[] = "NV34 [GeForce FX 5200 Ultra]"; +static const char pci_device_10de_0322[] = "NV34 [GeForce FX 5200]"; +static const char pci_device_10de_0323[] = "GeForce FX 5200SE"; +static const char pci_device_10de_0324[] = "GeForce FX Go5200"; +static const char pci_device_10de_0325[] = "GeForce FX Go5250"; +static const char pci_device_10de_0328[] = "GeForce FX Go5200 32M/64M"; +static const char pci_device_10de_0329[] = "GeForce FX 5200 (Mac)"; +static const char pci_device_10de_032a[] = "Quadro NVS 280 PCI"; +static const char pci_device_10de_032b[] = "NV34GL [Quadro FX 500]"; +static const char pci_device_10de_032c[] = "GeForce FX Go5300"; +static const char pci_device_10de_032d[] = "GeForce FX Go5100"; +static const char pci_device_10de_0330[] = "NV35 [GeForce FX 5900 Ultra]"; +static const char pci_device_10de_0331[] = "NV35 [GeForce FX 5900]"; +static const char pci_device_10de_0332[] = "GeForce FX 5900XT"; +static const char pci_device_10de_0333[] = "GeForce FX 5950 Ultra"; +static const char pci_device_10de_0338[] = "NV35GL [Quadro FX 3000]"; +static const char pci_device_10de_0341[] = "GeForce FX 5700 Ultra"; +static const char pci_device_10de_0342[] = "GeForce FX 5700"; +static const char pci_device_10de_034e[] = "Quadro FX 1100"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10df[] = "Emulex Corporation"; static const char pci_device_10df_1ae5[] = "LP6000 Fibre Channel Host Adapter"; @@ -5292,6 +5533,7 @@ static const char pci_device_10e8_80da[] = "PCI-9812"; static const char pci_device_10e8_811a[] = "PCI-IEEE1355-DS-DE Interface"; static const char pci_device_10e8_8170[] = "S5933 [Matchmaker] (Chipset Development Tool)"; static const char pci_device_10e8_82db[] = "AJA HDNTV HD SDI Framestore"; +static const char pci_device_10e8_8851[] = "S5933 on Innes Corp FM Radio Capture card"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10e9[] = "Alps Electric Co., Ltd."; @@ -5425,6 +5667,7 @@ static const char pci_device_10ee_3fc2[] = "RME Digi96/8 Pro"; static const char pci_device_10ee_3fc3[] = "RME Digi96/8 Pad"; static const char pci_device_10ee_3fc4[] = "RME Digi9652 (Hammerfall)"; static const char pci_device_10ee_3fc5[] = "RME Hammerfall DSP"; +static const char pci_device_10ee_8381[] = "Ellips Santos Frame Grabber"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10ef[] = "Racore Computer Products, Inc."; @@ -5635,6 +5878,9 @@ static const char pci_subsys_1106_0571_1106_0571[] = "VT82C586/B/VT82C686/A/B/VT static const char pci_subsys_1106_0571_1179_0001[] = "Magnia Z310"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_0571_1297_f641[] = "FX41 motherboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_0571_1458_5002[] = "GA-7VAX Mainboard"; #endif static const char pci_device_1106_0576[] = "VT82C576 3V [Apollo Master]"; @@ -5720,6 +5966,9 @@ static const char pci_subsys_1106_3038_1043_808c[] = "A7V8X motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3038_1179_0001[] = "Magnia Z310"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3038_1458_5004[] = "GA-7VAX Mainboard"; +#endif static const char pci_device_1106_3040[] = "VT82C586B ACPI"; static const char pci_device_1106_3043[] = "VT86C100A [Rhine]"; #ifdef INIT_SUBSYS_INFO @@ -5779,6 +6028,9 @@ static const char pci_device_1106_3059[] = "VT8233/A/8235 AC97 Audio Controller" static const char pci_subsys_1106_3059_1043_8095[] = "A7V8X Motherboard (Realtek ALC650 codec)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_1297_c160[] = "FX41 motherboard (Realtek ALC650 codec)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_1458_a002[] = "GA-7VAX Onboard Audio (Realtek ALC650)"; #endif static const char pci_device_1106_3065[] = "VT6102 [Rhine-II]"; @@ -5815,12 +6067,18 @@ static const char pci_device_1106_3104[] = "USB 2.0"; static const char pci_subsys_1106_3104_1043_808c[] = "A7V8X motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3104_1297_f641[] = "FX41 motherboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3104_1458_5004[] = "GA-7VAX Mainboard"; #endif static const char pci_device_1106_3106[] = "VT6105 [Rhine-III]"; static const char pci_device_1106_3109[] = "VT8233C PCI to ISA Bridge"; static const char pci_device_1106_3112[] = "VT8361 [KLE133] Host Bridge"; static const char pci_device_1106_3116[] = "VT8375 [KM266/KL266] Host Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3116_1297_f641[] = "FX41 motherboard"; +#endif static const char pci_device_1106_3122[] = "VT8623 [Apollo CLE266] integrated CastleRock graphics"; static const char pci_device_1106_3123[] = "VT8623 [Apollo CLE266]"; static const char pci_device_1106_3128[] = "VT8753 [P4X266 AGP]"; @@ -5834,6 +6092,9 @@ static const char pci_device_1106_3177[] = "VT8235 ISA Bridge"; static const char pci_subsys_1106_3177_1043_808c[] = "A7V8X motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3177_1297_f641[] = "FX41 motherboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3177_1458_5001[] = "GA-7VAX Mainboard"; #endif static const char pci_device_1106_3189[] = "VT8377 [KT400 AGP] Host Bridge"; @@ -5867,6 +6128,7 @@ static const char pci_device_1106_b102[] = "VT8362 AGP Bridge"; static const char pci_device_1106_b103[] = "VT8615 AGP Bridge"; static const char pci_device_1106_b112[] = "VT8361 [KLE133] AGP Bridge"; static const char pci_device_1106_b168[] = "VT8235 PCI Bridge"; +static const char pci_device_1106_b198[] = "VT8237 PCI Bridge"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1107[] = "Stratus Computers"; @@ -5898,6 +6160,7 @@ static const char pci_device_110a_007b[] = "FSC Remote Service Controller, mailb static const char pci_device_110a_007c[] = "FSC Remote Service Controller, shared memory device"; static const char pci_device_110a_007d[] = "FSC Remote Service Controller, SMIC device"; static const char pci_device_110a_2102[] = "DSCC4 WAN adapter"; +static const char pci_device_110a_4021[] = "SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter)"; static const char pci_device_110a_4942[] = "FPGA I-Bus Tracer for MBD"; static const char pci_device_110a_6120[] = "SZB6120"; #endif @@ -6172,7 +6435,13 @@ static const char pci_device_1131_1561[] = "USB 1.1 Host Controller"; static const char pci_device_1131_1562[] = "USB 2.0 Host Controller"; static const char pci_device_1131_3400[] = "SmartPCI56(UCB1500) 56K Modem"; static const char pci_device_1131_7130[] = "SAA7130 Video Broadcast Decoder"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7130_5168_0138[] = "LiveView FlyVideo 2000"; +#endif static const char pci_device_1131_7133[] = "SAA7133 Audio+video broadcast decoder"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7133_5168_0138[] = "LifeView FlyVideo 3000"; +#endif static const char pci_device_1131_7134[] = "SAA7134"; static const char pci_device_1131_7135[] = "SAA7135 Audio+video broadcast decoder"; static const char pci_device_1131_7145[] = "SAA7145"; @@ -6203,40 +6472,107 @@ static const char pci_device_1133_7944[] = "EiconCard S94"; static const char pci_device_1133_b921[] = "EiconCard P92"; static const char pci_device_1133_b922[] = "EiconCard P92"; static const char pci_device_1133_b923[] = "EiconCard P92"; -static const char pci_device_1133_e001[] = "DIVA 20PRO"; +static const char pci_device_1133_e001[] = "Diva Pro 2.0 S/T"; +static const char pci_device_1133_e002[] = "Diva 2.0 S/T PCI"; +static const char pci_device_1133_e003[] = "Diva Pro 2.0 U"; +static const char pci_device_1133_e004[] = "Diva 2.0 U PCI"; +static const char pci_device_1133_e005[] = "Diva 2.01 S/T PCI"; +static const char pci_device_1133_e006[] = "Diva CT S/T PCI"; +static const char pci_device_1133_e007[] = "Diva CT U PCI"; +static const char pci_device_1133_e008[] = "Diva CT Lite S/T PCI"; +static const char pci_device_1133_e009[] = "Diva CT Lite U PCI"; +static const char pci_device_1133_e00a[] = "Diva ISDN+V.90 PCI"; +static const char pci_device_1133_e00b[] = "Diva 2.02 PCI S/T"; +static const char pci_device_1133_e00c[] = "Diva 2.02 PCI U"; +static const char pci_device_1133_e00d[] = "Diva ISDN Pro 3.0 PCI"; +static const char pci_device_1133_e00e[] = "Diva ISDN+CT S/T PCI Rev 2"; +static const char pci_device_1133_e010[] = "Diva Server BRI-2M PCI"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e001_1133_e001[] = "DIVA Pro 2.0 S/T"; +static const char pci_subsys_1133_e010_110a_0021[] = "Fujitsu Siemens ISDN S0"; #endif -static const char pci_device_1133_e002[] = "DIVA 20"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e002_1133_e002[] = "DIVA 2.0 S/T"; +static const char pci_subsys_1133_e010_8001_0014[] = "Diva Server BRI-2M PCI Cornet NQ"; #endif -static const char pci_device_1133_e003[] = "DIVA 20PRO_U"; +static const char pci_device_1133_e011[] = "Diva Server BRI S/T Rev 2"; +static const char pci_device_1133_e012[] = "Diva Server 4BRI-8M PCI"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e003_1133_e003[] = "DIVA Pro 2.0 U"; +static const char pci_subsys_1133_e012_8001_0014[] = "Diva Server 4BRI-8M PCI Cornet NQ"; #endif -static const char pci_device_1133_e004[] = "DIVA 20_U"; +static const char pci_device_1133_e013[] = "Diva Server 4BRI-8M Rev 2"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e004_1133_e004[] = "DIVA 2.0 U"; +static const char pci_subsys_1133_e013_8001_0014[] = "Diva Server 4BRI-8M Cornet NQ 2"; #endif -static const char pci_device_1133_e005[] = "DIVA LOW"; +static const char pci_device_1133_e014[] = "Diva Server PRI-30M PCI"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e005_1133_e005[] = "DIVA 2.01 S/T"; +static const char pci_subsys_1133_e014_0008_0100[] = "Diva Server PRI-30M PCI"; #endif -static const char pci_device_1133_e00b[] = "DIVA 2.02"; -static const char pci_device_1133_e010[] = "DIVA Server BRI-2M"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e010_1133_e010[] = "DIVA Server BRI-2M"; +static const char pci_subsys_1133_e014_8001_0014[] = "Diva Server PRI-30M PCI Cornet NQ"; #endif -static const char pci_device_1133_e012[] = "DIVA Server BRI-8M"; +static const char pci_device_1133_e015[] = "DIVA Server PRI-30M 2.0"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e012_1133_e012[] = "DIVA Server BRI-8M"; +static const char pci_subsys_1133_e015_8001_0014[] = "Diva Server PRI Cornet NQ 2"; #endif -static const char pci_device_1133_e014[] = "DIVA Server PRI-30M"; +static const char pci_device_1133_e016[] = "Diva Server Voice 4BRI PCI"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1133_e014_1133_e014[] = "DIVA Server PRI-30M"; +static const char pci_subsys_1133_e016_8001_0014[] = "Diva Server PRI Cornet NQ"; #endif -static const char pci_device_1133_e018[] = "DIVA Server BRI-2M/-2F"; +static const char pci_device_1133_e017[] = "Diva Server Voice 4BRI PCI Rev 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e017_8001_0014[] = "Diva Server Voice 4BRI PCI Cornet NQ 2"; +#endif +static const char pci_device_1133_e018[] = "Diva Server BRI 2M Revision 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e018_8001_0014[] = "Diva Server BRI 2M Cornet NQ 2"; +#endif +static const char pci_device_1133_e019[] = "Diva Server Voice PRI PCI Rev 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e019_8001_0014[] = "Diva Server Voice PRI PCI Cornet NQ 2"; +#endif +static const char pci_device_1133_e01a[] = "Diva Server 2FX"; +static const char pci_device_1133_e01b[] = "Diva Server BRI-2M Voice Revision 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01b_8001_0014[] = "Diva Server BRI-2M Voice Cornet NQ 2"; +#endif +static const char pci_device_1133_e01c[] = "Diva Server PRI Rev 3.0"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c01[] = "Diva Server PRI/E1/T1-8 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c02[] = "Diva Server PRI/T1-24 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c03[] = "Diva Server PRI/E1-30 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c04[] = "Diva Server V-PRI/E1/T1 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c05[] = "Diva Server V-PRI/T1-24 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c06[] = "Diva Server V-PRI/E1-30 Rev 3.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c07[] = "Diva Server PRI/E1/T1-8 Cornet NQ 3"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c08[] = "Diva Server PRI/T1-24 Cornet NQ 3"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c09[] = "Diva Server PRI/E1-30 Cornet NQ 3"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c0a[] = "Diva Server V-PRI/E1/T1 Cornet NQ 3"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c0b[] = "Diva Server V-PRI/T1-24 Cornet NQ 3"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1133_e01c_1133_1c0c[] = "Diva Server V-PRI/E1-30 Cornet NQ 3"; +#endif +static const char pci_device_1133_e01e[] = "Diva Server 2PRI"; +static const char pci_device_1133_e020[] = "Diva Server 4PRI"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1134[] = "Mercury Computer Systems"; @@ -6709,14 +7045,29 @@ static const char pci_device_1166_0016[] = "CMIC-GC Host Bridge"; static const char pci_device_1166_0017[] = "GCNB-LE Host Bridge"; static const char pci_device_1166_0200[] = "OSB4 South Bridge"; static const char pci_device_1166_0201[] = "CSB5 South Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0201_4c53_1080[] = "CT8 mainboard"; +#endif static const char pci_device_1166_0203[] = "CSB6 South Bridge"; static const char pci_device_1166_0211[] = "OSB4 IDE Controller"; static const char pci_device_1166_0212[] = "CSB5 IDE Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0212_4c53_1080[] = "CT8 mainboard"; +#endif static const char pci_device_1166_0213[] = "CSB6 RAID/IDE Controller"; static const char pci_device_1166_0220[] = "OSB4/CSB5 OHCI USB Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0220_4c53_1080[] = "CT8 mainboard"; +#endif static const char pci_device_1166_0221[] = "CSB6 OHCI USB Controller"; static const char pci_device_1166_0225[] = "GCLE Host Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0225_4c53_1080[] = "CT8 mainboard"; +#endif static const char pci_device_1166_0227[] = "GCLE-2 Host Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0227_4c53_1080[] = "CT8 mainboard"; +#endif #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1167[] = "Mutoh Industries Inc"; @@ -7368,6 +7719,11 @@ static const char pci_device_11c1_044d[] = "LT WinModem"; static const char pci_device_11c1_044e[] = "LT WinModem"; static const char pci_device_11c1_044f[] = "V90 WildWire Modem"; static const char pci_device_11c1_0450[] = "LT WinModem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11c1_0450_1033_80a8[] = "Versa Note Vxi"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO static const char pci_subsys_11c1_0450_144f_4005[] = "Magnia SG20"; #endif @@ -8053,6 +8409,8 @@ static const char pci_subsys_1242_1560_1242_6562[] = "FCX2-6562 Dual Channel PCI static const char pci_subsys_1242_1560_1242_656a[] = "FCX-6562 PCI-X Fibre Channel Adapter"; #endif static const char pci_device_1242_4643[] = "FCI-1063 Fibre Channel Adapter"; +static const char pci_device_1242_6562[] = "FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter"; +static const char pci_device_1242_656a[] = "FCX-6562 PCI-X Fibre Channel Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1243[] = "Delphax"; @@ -8183,7 +8541,7 @@ static const char pci_subsys_125d_1969_125d_8888[] = "Solo-1 Audio Adapter"; static const char pci_device_125d_1978[] = "ES1978 Maestro 2E"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_125d_1978_0e11_b112[] = "Armada M700"; +static const char pci_subsys_125d_1978_0e11_b112[] = "Armada M700/E500"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #endif @@ -8220,6 +8578,11 @@ static const char pci_subsys_125d_1989_125d_1989[] = "ESS Modem"; static const char pci_device_125d_1998[] = "ES1983S Maestro-3i PCI Audio Accelerator"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_125d_1998_1028_00b1[] = "Latitude C600"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_125d_1998_1028_00e6[] = "ES1983S Maestro-3i (Dell Inspiron 8100)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -9135,7 +9498,7 @@ static const char pci_vendor_12b7[] = "Cognex Modular Vision Systems Div. - Acum static const char pci_vendor_12b8[] = "Korg"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_12b9[] = "US Robotics/3Com"; +static const char pci_vendor_12b9[] = "5610 56K FaxModem"; static const char pci_device_12b9_1006[] = "WinModem"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_12b9_1006_12b9_005c[] = "USR 56k Internal Voice WinModem (Model 3472)"; @@ -9371,6 +9734,7 @@ static const char pci_vendor_12dd[] = "Management Graphics"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_12de[] = "Rainbow Technologies"; +static const char pci_device_12de_0200[] = "CryptoSwift CS200"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_12df[] = "SBS Technologies Inc"; @@ -9813,6 +10177,10 @@ static const char pci_vendor_1330[] = "MMC Networks"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1331[] = "Radisys Corp."; +static const char pci_device_1331_8200[] = "82600 Host Bridge"; +static const char pci_device_1331_8201[] = "82600 IDE"; +static const char pci_device_1331_8202[] = "82600 USB"; +static const char pci_device_1331_8210[] = "82600 PCI Bridge"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1332[] = "Micro Memory"; @@ -9887,6 +10255,9 @@ static const char pci_vendor_134c[] = "Chori Joho System Co. Ltd"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_134d[] = "PCTel Inc"; static const char pci_device_134d_7890[] = "HSP MicroModem 56"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_134d_7890_134d_0001[] = "PCT789 adapter"; +#endif static const char pci_device_134d_7891[] = "HSP MicroModem 56"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_134d_7891_134d_0001[] = "HSP MicroModem 56"; @@ -10002,6 +10373,7 @@ static const char pci_vendor_136a[] = "High Soft Tech"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_136b[] = "Kawasaki Steel Corporation"; +static const char pci_device_136b_ff01[] = "KL5A72002 Motion JPEG"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_136c[] = "Adtek System Science Co Ltd"; @@ -10286,7 +10658,10 @@ static const char pci_vendor_13bf[] = "Sharewave Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13c0[] = "Microgate Corporation"; -static const char pci_device_13c0_0010[] = "SyncLink WAN Adapter"; +static const char pci_device_13c0_0010[] = "SyncLink Adapter v1"; +static const char pci_device_13c0_0020[] = "SyncLink SCC Adapter"; +static const char pci_device_13c0_0030[] = "SyncLink Multiport Adapter"; +static const char pci_device_13c0_0210[] = "SyncLink Adapter v2"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13c1[] = "3ware Inc"; @@ -10474,6 +10849,9 @@ static const char pci_device_13f6_0111[] = "CM8738"; static const char pci_subsys_13f6_0111_1019_0970[] = "P6STP-FL motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_13f6_0111_1043_8035[] = "CUSI-FX motherboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_13f6_0111_1043_8077[] = "CMI8738 6-channel audio controller"; #endif #ifdef INIT_SUBSYS_INFO @@ -10645,6 +11023,8 @@ static const char pci_vendor_141f[] = "Visiontech Ltd"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1420[] = "Psion Dacom plc"; +static const char pci_device_1420_8002[] = "Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part)"; +static const char pci_device_1420_8003[] = "Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1421[] = "Ads Technologies Inc"; @@ -11561,6 +11941,9 @@ static const char pci_device_14e4_4211[] = "BCM4211 iLine10 HomePNA 2.0 + V.90 5 static const char pci_device_14e4_4212[] = "BCM4212 v.90 56k modem"; static const char pci_device_14e4_4301[] = "BCM4301 802.11b"; static const char pci_device_14e4_4320[] = "BCM94306 802.11g"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_4320_1737_4320[] = "WPC54G"; +#endif static const char pci_device_14e4_4401[] = "BCM4401 100Base-T"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_4401_1043_80a8[] = "A7V8X motherboard"; @@ -11910,7 +12293,9 @@ static const char pci_vendor_14fa[] = "WANDEL & GOCHERMANN"; static const char pci_vendor_14fb[] = "TRANSAS MARINE (UK) Ltd"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_14fc[] = "QUADRICS Supercomputers World"; +static const char pci_vendor_14fc[] = "Quadrics Ltd"; +static const char pci_device_14fc_0000[] = "QsNet Elan3 Network Adapter"; +static const char pci_device_14fc_0001[] = "QsNetII Elan4 Network Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_14fd[] = "JAPAN Computer Industry Inc"; @@ -12992,7 +13377,17 @@ static const char pci_vendor_3142[] = "Post Impression Systems."; static const char pci_vendor_3388[] = "Hint Corp"; static const char pci_device_3388_0013[] = "HiNT HC4 PCI to ISDN bridge, Multimedia audio controller"; static const char pci_device_3388_0014[] = "HiNT HC4 PCI to ISDN bridge, Network controller"; -static const char pci_device_3388_0021[] = "HB1-SE33 PCI-PCI Bridge"; +static const char pci_device_3388_0020[] = "HB6 Universal PCI-PCI bridge (transparent mode)"; +static const char pci_device_3388_0021[] = "HB6 Universal PCI-PCI bridge (non-transparent mode)"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_3388_0021_4c53_1050[] = "CT7 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_3388_0021_4c53_1080[] = "CT8 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_3388_0021_4c53_3010[] = "PPCI mezzanine (32-bit PMC)"; +#endif static const char pci_device_3388_101a[] = "E.Band [AudioTrak Inca88]"; static const char pci_device_3388_101b[] = "E.Band [AudioTrak Inca88]"; static const char pci_device_3388_8011[] = "VXPro II Chipset"; @@ -15378,6 +15773,14 @@ static const pciSubsystemInfo pci_ss_info_1000_000f_1de1_3904 = {0x1de1, 0x3904, pci_subsys_1000_000f_1de1_3904, 0}; #undef pci_ss_info_1de1_3904 #define pci_ss_info_1de1_3904 pci_ss_info_1000_000f_1de1_3904 +static const pciSubsystemInfo pci_ss_info_1000_000f_4c53_1000 = + {0x4c53, 0x1000, pci_subsys_1000_000f_4c53_1000, 0}; +#undef pci_ss_info_4c53_1000 +#define pci_ss_info_4c53_1000 pci_ss_info_1000_000f_4c53_1000 +static const pciSubsystemInfo pci_ss_info_1000_000f_4c53_1050 = + {0x4c53, 0x1050, pci_subsys_1000_000f_4c53_1050, 0}; +#undef pci_ss_info_4c53_1050 +#define pci_ss_info_4c53_1050 pci_ss_info_1000_000f_4c53_1050 #endif static const pciSubsystemInfo pci_ss_info_1000_0010_0e11_4040 = {0x0e11, 0x4040, pci_subsys_1000_0010_0e11_4040, 0}; @@ -15394,6 +15797,18 @@ static const pciSubsystemInfo pci_ss_info_1000_0020_1de1_1020 = {0x1de1, 0x1020, pci_subsys_1000_0020_1de1_1020, 0}; #undef pci_ss_info_1de1_1020 #define pci_ss_info_1de1_1020 pci_ss_info_1000_0020_1de1_1020 +static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1000_0021_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1000_0021_4c53_1080 +static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1300 = + {0x4c53, 0x1300, pci_subsys_1000_0021_4c53_1300, 0}; +#undef pci_ss_info_4c53_1300 +#define pci_ss_info_4c53_1300 pci_ss_info_1000_0021_4c53_1300 +static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1310 = + {0x4c53, 0x1310, pci_subsys_1000_0021_4c53_1310, 0}; +#undef pci_ss_info_4c53_1310 +#define pci_ss_info_4c53_1310 pci_ss_info_1000_0021_4c53_1310 #endif static const pciSubsystemInfo pci_ss_info_1000_0030_1028_1010 = {0x1028, 0x1010, pci_subsys_1000_0030_1028_1010, 0}; @@ -15579,6 +15994,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4752_1002_8008 = {0x1002, 0x8008, pci_subsys_1002_4752_1002_8008, 0}; #undef pci_ss_info_1002_8008 #define pci_ss_info_1002_8008 pci_ss_info_1002_4752_1002_8008 +static const pciSubsystemInfo pci_ss_info_1002_4752_1028_00ce = + {0x1028, 0x00ce, pci_subsys_1002_4752_1028_00ce, 0}; +#undef pci_ss_info_1028_00ce +#define pci_ss_info_1028_00ce pci_ss_info_1002_4752_1028_00ce static const pciSubsystemInfo pci_ss_info_1002_4752_1028_00d1 = {0x1028, 0x00d1, pci_subsys_1002_4752_1028_00d1, 0}; #undef pci_ss_info_1028_00d1 @@ -15679,6 +16098,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c42_1028_0085 = {0x1028, 0x0085, pci_subsys_1002_4c42_1028_0085, 0}; #undef pci_ss_info_1028_0085 #define pci_ss_info_1028_0085 pci_ss_info_1002_4c42_1028_0085 +static const pciSubsystemInfo pci_ss_info_1002_4c46_1028_00b1 = + {0x1028, 0x00b1, pci_subsys_1002_4c46_1028_00b1, 0}; +#undef pci_ss_info_1028_00b1 +#define pci_ss_info_1028_00b1 pci_ss_info_1002_4c46_1028_00b1 static const pciSubsystemInfo pci_ss_info_1002_4c49_1002_0004 = {0x1002, 0x0004, pci_subsys_1002_4c49_1002_0004, 0}; #undef pci_ss_info_1002_0004 @@ -15699,6 +16122,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c4d_0e11_b111 = {0x0e11, 0xb111, pci_subsys_1002_4c4d_0e11_b111, 0}; #undef pci_ss_info_0e11_b111 #define pci_ss_info_0e11_b111 pci_ss_info_1002_4c4d_0e11_b111 +static const pciSubsystemInfo pci_ss_info_1002_4c4d_0e11_b160 = + {0x0e11, 0xb160, pci_subsys_1002_4c4d_0e11_b160, 0}; +#undef pci_ss_info_0e11_b160 +#define pci_ss_info_0e11_b160 pci_ss_info_1002_4c4d_0e11_b160 static const pciSubsystemInfo pci_ss_info_1002_4c4d_1002_0084 = {0x1002, 0x0084, pci_subsys_1002_4c4d_1002_0084, 0}; #undef pci_ss_info_1002_0084 @@ -15707,6 +16134,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c4d_1014_0154 = {0x1014, 0x0154, pci_subsys_1002_4c4d_1014_0154, 0}; #undef pci_ss_info_1014_0154 #define pci_ss_info_1014_0154 pci_ss_info_1002_4c4d_1014_0154 +static const pciSubsystemInfo pci_ss_info_1002_4c4d_1028_00aa = + {0x1028, 0x00aa, pci_subsys_1002_4c4d_1028_00aa, 0}; +#undef pci_ss_info_1028_00aa +#define pci_ss_info_1028_00aa pci_ss_info_1002_4c4d_1028_00aa static const pciSubsystemInfo pci_ss_info_1002_4c50_1002_4c50 = {0x1002, 0x4c50, pci_subsys_1002_4c50_1002_4c50, 0}; #undef pci_ss_info_1002_4c50 @@ -15739,6 +16170,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4e45_1002_0002 = {0x1002, 0x0002, pci_subsys_1002_4e45_1002_0002, 0}; #undef pci_ss_info_1002_0002 #define pci_ss_info_1002_0002 pci_ss_info_1002_4e45_1002_0002 +static const pciSubsystemInfo pci_ss_info_1002_4e65_1002_0003 = + {0x1002, 0x0003, pci_subsys_1002_4e65_1002_0003, 0}; +#undef pci_ss_info_1002_0003 +#define pci_ss_info_1002_0003 pci_ss_info_1002_4e65_1002_0003 static const pciSubsystemInfo pci_ss_info_1002_5044_1002_0028 = {0x1002, 0x0028, pci_subsys_1002_5044_1002_0028, 0}; #undef pci_ss_info_1002_0028 @@ -16093,6 +16528,10 @@ static const pciSubsystemInfo pci_ss_info_1004_0306_1483_5022 = #undef pci_ss_info_1483_5022 #define pci_ss_info_1483_5022 pci_ss_info_1004_0306_1483_5022 #endif +static const pciSubsystemInfo pci_ss_info_100b_0020_1385_f311 = + {0x1385, 0xf311, pci_subsys_100b_0020_1385_f311, 0}; +#undef pci_ss_info_1385_f311 +#define pci_ss_info_1385_f311 pci_ss_info_100b_0020_1385_f311 static const pciSubsystemInfo pci_ss_info_1011_0009_1025_0310 = {0x1025, 0x0310, pci_subsys_1011_0009_1025_0310, 0}; #undef pci_ss_info_1025_0310 @@ -16321,6 +16760,14 @@ static const pciSubsystemInfo pci_ss_info_1011_0046_12d9_000a = {0x12d9, 0x000a, pci_subsys_1011_0046_12d9_000a, 0}; #undef pci_ss_info_12d9_000a #define pci_ss_info_12d9_000a pci_ss_info_1011_0046_12d9_000a +static const pciSubsystemInfo pci_ss_info_1011_0046_4c53_1050 = + {0x4c53, 0x1050, pci_subsys_1011_0046_4c53_1050, 0}; +#undef pci_ss_info_4c53_1050 +#define pci_ss_info_4c53_1050 pci_ss_info_1011_0046_4c53_1050 +static const pciSubsystemInfo pci_ss_info_1011_0046_4c53_1051 = + {0x4c53, 0x1051, pci_subsys_1011_0046_4c53_1051, 0}; +#undef pci_ss_info_4c53_1051 +#define pci_ss_info_4c53_1051 pci_ss_info_1011_0046_4c53_1051 static const pciSubsystemInfo pci_ss_info_1011_0046_9005_0365 = {0x9005, 0x0365, pci_subsys_1011_0046_9005_0365, 0}; #undef pci_ss_info_9005_0365 @@ -16470,6 +16917,14 @@ static const pciSubsystemInfo pci_ss_info_1014_0144_1014_0145 = {0x1014, 0x0145, pci_subsys_1014_0144_1014_0145, 0}; #undef pci_ss_info_1014_0145 #define pci_ss_info_1014_0145 pci_ss_info_1014_0144_1014_0145 +static const pciSubsystemInfo pci_ss_info_1014_0180_1014_0241 = + {0x1014, 0x0241, pci_subsys_1014_0180_1014_0241, 0}; +#undef pci_ss_info_1014_0241 +#define pci_ss_info_1014_0241 pci_ss_info_1014_0180_1014_0241 +static const pciSubsystemInfo pci_ss_info_1014_0180_1014_0264 = + {0x1014, 0x0264, pci_subsys_1014_0180_1014_0264, 0}; +#undef pci_ss_info_1014_0264 +#define pci_ss_info_1014_0264 pci_ss_info_1014_0180_1014_0264 static const pciSubsystemInfo pci_ss_info_1014_01bd_1014_01be = {0x1014, 0x01be, pci_subsys_1014_01bd_1014_01be, 0}; #undef pci_ss_info_1014_01be @@ -16498,6 +16953,18 @@ static const pciSubsystemInfo pci_ss_info_1014_01bd_1014_0259 = {0x1014, 0x0259, pci_subsys_1014_01bd_1014_0259, 0}; #undef pci_ss_info_1014_0259 #define pci_ss_info_1014_0259 pci_ss_info_1014_01bd_1014_0259 +static const pciSubsystemInfo pci_ss_info_1014_0219_1014_021a = + {0x1014, 0x021a, pci_subsys_1014_0219_1014_021a, 0}; +#undef pci_ss_info_1014_021a +#define pci_ss_info_1014_021a pci_ss_info_1014_0219_1014_021a +static const pciSubsystemInfo pci_ss_info_1014_0219_1014_0251 = + {0x1014, 0x0251, pci_subsys_1014_0219_1014_0251, 0}; +#undef pci_ss_info_1014_0251 +#define pci_ss_info_1014_0251 pci_ss_info_1014_0219_1014_0251 +static const pciSubsystemInfo pci_ss_info_1014_0219_1014_0252 = + {0x1014, 0x0252, pci_subsys_1014_0219_1014_0252, 0}; +#undef pci_ss_info_1014_0252 +#define pci_ss_info_1014_0252 pci_ss_info_1014_0219_1014_0252 #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0471 = @@ -16589,6 +17056,30 @@ static const pciSubsystemInfo pci_ss_info_1022_2000_1259_2701 = {0x1259, 0x2701, pci_subsys_1022_2000_1259_2701, 0}; #undef pci_ss_info_1259_2701 #define pci_ss_info_1259_2701 pci_ss_info_1022_2000_1259_2701 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1000 = + {0x4c53, 0x1000, pci_subsys_1022_2000_4c53_1000, 0}; +#undef pci_ss_info_4c53_1000 +#define pci_ss_info_4c53_1000 pci_ss_info_1022_2000_4c53_1000 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1010 = + {0x4c53, 0x1010, pci_subsys_1022_2000_4c53_1010, 0}; +#undef pci_ss_info_4c53_1010 +#define pci_ss_info_4c53_1010 pci_ss_info_1022_2000_4c53_1010 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1020 = + {0x4c53, 0x1020, pci_subsys_1022_2000_4c53_1020, 0}; +#undef pci_ss_info_4c53_1020 +#define pci_ss_info_4c53_1020 pci_ss_info_1022_2000_4c53_1020 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1030 = + {0x4c53, 0x1030, pci_subsys_1022_2000_4c53_1030, 0}; +#undef pci_ss_info_4c53_1030 +#define pci_ss_info_4c53_1030 pci_ss_info_1022_2000_4c53_1030 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1040 = + {0x4c53, 0x1040, pci_subsys_1022_2000_4c53_1040, 0}; +#undef pci_ss_info_4c53_1040 +#define pci_ss_info_4c53_1040 pci_ss_info_1022_2000_4c53_1040 +static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1060 = + {0x4c53, 0x1060, pci_subsys_1022_2000_4c53_1060, 0}; +#undef pci_ss_info_4c53_1060 +#define pci_ss_info_4c53_1060 pci_ss_info_1022_2000_4c53_1060 static const pciSubsystemInfo pci_ss_info_1022_2001_1092_0a78 = {0x1092, 0x0a78, pci_subsys_1022_2001_1092_0a78, 0}; #undef pci_ss_info_1092_0a78 @@ -17125,10 +17616,50 @@ static const pciSubsystemInfo pci_ss_info_102c_00c0_102c_00c0 = {0x102c, 0x00c0, pci_subsys_102c_00c0_102c_00c0, 0}; #undef pci_ss_info_102c_00c0 #define pci_ss_info_102c_00c0 pci_ss_info_102c_00c0_102c_00c0 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1000 = + {0x4c53, 0x1000, pci_subsys_102c_00c0_4c53_1000, 0}; +#undef pci_ss_info_4c53_1000 +#define pci_ss_info_4c53_1000 pci_ss_info_102c_00c0_4c53_1000 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1010 = + {0x4c53, 0x1010, pci_subsys_102c_00c0_4c53_1010, 0}; +#undef pci_ss_info_4c53_1010 +#define pci_ss_info_4c53_1010 pci_ss_info_102c_00c0_4c53_1010 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1020 = + {0x4c53, 0x1020, pci_subsys_102c_00c0_4c53_1020, 0}; +#undef pci_ss_info_4c53_1020 +#define pci_ss_info_4c53_1020 pci_ss_info_102c_00c0_4c53_1020 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1030 = + {0x4c53, 0x1030, pci_subsys_102c_00c0_4c53_1030, 0}; +#undef pci_ss_info_4c53_1030 +#define pci_ss_info_4c53_1030 pci_ss_info_102c_00c0_4c53_1030 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1050 = + {0x4c53, 0x1050, pci_subsys_102c_00c0_4c53_1050, 0}; +#undef pci_ss_info_4c53_1050 +#define pci_ss_info_4c53_1050 pci_ss_info_102c_00c0_4c53_1050 +static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1051 = + {0x4c53, 0x1051, pci_subsys_102c_00c0_4c53_1051, 0}; +#undef pci_ss_info_4c53_1051 +#define pci_ss_info_4c53_1051 pci_ss_info_102c_00c0_4c53_1051 static const pciSubsystemInfo pci_ss_info_102c_00e5_0e11_b049 = {0x0e11, 0xb049, pci_subsys_102c_00e5_0e11_b049, 0}; #undef pci_ss_info_0e11_b049 #define pci_ss_info_0e11_b049 pci_ss_info_102c_00e5_0e11_b049 +static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1000 = + {0x4c53, 0x1000, pci_subsys_102c_0c30_4c53_1000, 0}; +#undef pci_ss_info_4c53_1000 +#define pci_ss_info_4c53_1000 pci_ss_info_102c_0c30_4c53_1000 +static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1050 = + {0x4c53, 0x1050, pci_subsys_102c_0c30_4c53_1050, 0}; +#undef pci_ss_info_4c53_1050 +#define pci_ss_info_4c53_1050 pci_ss_info_102c_0c30_4c53_1050 +static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1051 = + {0x4c53, 0x1051, pci_subsys_102c_0c30_4c53_1051, 0}; +#undef pci_ss_info_4c53_1051 +#define pci_ss_info_4c53_1051 pci_ss_info_102c_0c30_4c53_1051 +static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_102c_0c30_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_102c_0c30_4c53_1080 #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_102f_0020_102f_00f8 = {0x102f, 0x00f8, pci_subsys_102f_0020_102f_00f8, 0}; @@ -17207,6 +17738,10 @@ static const pciSubsystemInfo pci_ss_info_1039_0900_1039_0900 = {0x1039, 0x0900, pci_subsys_1039_0900_1039_0900, 0}; #undef pci_ss_info_1039_0900 #define pci_ss_info_1039_0900 pci_ss_info_1039_0900_1039_0900 +static const pciSubsystemInfo pci_ss_info_1039_0900_1043_8035 = + {0x1043, 0x8035, pci_subsys_1039_0900_1043_8035, 0}; +#undef pci_ss_info_1043_8035 +#define pci_ss_info_1043_8035 pci_ss_info_1039_0900_1043_8035 static const pciSubsystemInfo pci_ss_info_1039_5513_1019_0970 = {0x1019, 0x0970, pci_subsys_1039_5513_1019_0970, 0}; #undef pci_ss_info_1019_0970 @@ -17215,10 +17750,18 @@ static const pciSubsystemInfo pci_ss_info_1039_5513_1039_5513 = {0x1039, 0x5513, pci_subsys_1039_5513_1039_5513, 0}; #undef pci_ss_info_1039_5513 #define pci_ss_info_1039_5513 pci_ss_info_1039_5513_1039_5513 +static const pciSubsystemInfo pci_ss_info_1039_5513_1043_8035 = + {0x1043, 0x8035, pci_subsys_1039_5513_1043_8035, 0}; +#undef pci_ss_info_1043_8035 +#define pci_ss_info_1043_8035 pci_ss_info_1039_5513_1043_8035 static const pciSubsystemInfo pci_ss_info_1039_6300_1019_0970 = {0x1019, 0x0970, pci_subsys_1039_6300_1019_0970, 0}; #undef pci_ss_info_1019_0970 #define pci_ss_info_1019_0970 pci_ss_info_1039_6300_1019_0970 +static const pciSubsystemInfo pci_ss_info_1039_6300_1043_8035 = + {0x1043, 0x8035, pci_subsys_1039_6300_1043_8035, 0}; +#undef pci_ss_info_1043_8035 +#define pci_ss_info_1043_8035 pci_ss_info_1039_6300_1043_8035 static const pciSubsystemInfo pci_ss_info_1039_6306_1039_6306 = {0x1039, 0x6306, pci_subsys_1039_6306_1039_6306, 0}; #undef pci_ss_info_1039_6306 @@ -17677,6 +18220,10 @@ static const pciSubsystemInfo pci_ss_info_104c_ac1b_0e11_b113 = {0x0e11, 0xb113, pci_subsys_104c_ac1b_0e11_b113, 0}; #undef pci_ss_info_0e11_b113 #define pci_ss_info_0e11_b113 pci_ss_info_104c_ac1b_0e11_b113 +static const pciSubsystemInfo pci_ss_info_104c_ac1c_0e11_b121 = + {0x0e11, 0xb121, pci_subsys_104c_ac1c_0e11_b121, 0}; +#undef pci_ss_info_0e11_b121 +#define pci_ss_info_0e11_b121 pci_ss_info_104c_ac1c_0e11_b121 static const pciSubsystemInfo pci_ss_info_104c_ac42_1028_00e6 = {0x1028, 0x00e6, pci_subsys_104c_ac42_1028_00e6, 0}; #undef pci_ss_info_1028_00e6 @@ -17685,6 +18232,10 @@ static const pciSubsystemInfo pci_ss_info_104c_ac51_1014_023b = {0x1014, 0x023b, pci_subsys_104c_ac51_1014_023b, 0}; #undef pci_ss_info_1014_023b #define pci_ss_info_1014_023b pci_ss_info_104c_ac51_1014_023b +static const pciSubsystemInfo pci_ss_info_104c_ac51_1028_00b1 = + {0x1028, 0x00b1, pci_subsys_104c_ac51_1028_00b1, 0}; +#undef pci_ss_info_1028_00b1 +#define pci_ss_info_1028_00b1 pci_ss_info_104c_ac51_1028_00b1 static const pciSubsystemInfo pci_ss_info_104c_ac51_10cf_1095 = {0x10cf, 0x1095, pci_subsys_104c_ac51_10cf_1095, 0}; #undef pci_ss_info_10cf_1095 @@ -18606,6 +19157,10 @@ static const pciSubsystemInfo pci_ss_info_10b5_9054_10b5_2455 = {0x10b5, 0x2455, pci_subsys_10b5_9054_10b5_2455, 0}; #undef pci_ss_info_10b5_2455 #define pci_ss_info_10b5_2455 pci_ss_info_10b5_9054_10b5_2455 +static const pciSubsystemInfo pci_ss_info_10b5_9054_10b5_2696 = + {0x10b5, 0x2696, pci_subsys_10b5_9054_10b5_2696, 0}; +#undef pci_ss_info_10b5_2696 +#define pci_ss_info_10b5_2696 pci_ss_info_10b5_9054_10b5_2696 static const pciSubsystemInfo pci_ss_info_10b5_9054_12d9_0002 = {0x12d9, 0x0002, pci_subsys_10b5_9054_12d9_0002, 0}; #undef pci_ss_info_12d9_0002 @@ -18862,6 +19417,12 @@ static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_0095 = #undef pci_ss_info_1028_0095 #define pci_ss_info_1028_0095 pci_ss_info_10b7_9200_1028_0095 #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_0097 = + {0x1028, 0x0097, pci_subsys_10b7_9200_1028_0097, 0}; +#undef pci_ss_info_1028_0097 +#define pci_ss_info_1028_0097 pci_ss_info_10b7_9200_1028_0097 +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_10b7_9200_10b7_1000 = {0x10b7, 0x1000, pci_subsys_10b7_9200_10b7_1000, 0}; #undef pci_ss_info_10b7_1000 @@ -19431,6 +19992,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0101_1043_400b = {0x1043, 0x400b, pci_subsys_10de_0101_1043_400b, 0}; #undef pci_ss_info_1043_400b #define pci_ss_info_1043_400b pci_ss_info_10de_0101_1043_400b +static const pciSubsystemInfo pci_ss_info_10de_0101_107d_2822 = + {0x107d, 0x2822, pci_subsys_10de_0101_107d_2822, 0}; +#undef pci_ss_info_107d_2822 +#define pci_ss_info_107d_2822 pci_ss_info_10de_0101_107d_2822 static const pciSubsystemInfo pci_ss_info_10de_0101_1102_102e = {0x1102, 0x102e, pci_subsys_10de_0101_1102_102e, 0}; #undef pci_ss_info_1102_102e @@ -19495,6 +20060,14 @@ static const pciSubsystemInfo pci_ss_info_10de_0171_147b_8f00 = {0x147b, 0x8f00, pci_subsys_10de_0171_147b_8f00, 0}; #undef pci_ss_info_147b_8f00 #define pci_ss_info_147b_8f00 pci_ss_info_10de_0171_147b_8f00 +static const pciSubsystemInfo pci_ss_info_10de_0181_1043_806f = + {0x1043, 0x806f, pci_subsys_10de_0181_1043_806f, 0}; +#undef pci_ss_info_1043_806f +#define pci_ss_info_1043_806f pci_ss_info_10de_0181_1043_806f +static const pciSubsystemInfo pci_ss_info_10de_0181_1462_8880 = + {0x1462, 0x8880, pci_subsys_10de_0181_1462_8880, 0}; +#undef pci_ss_info_1462_8880 +#define pci_ss_info_1462_8880 pci_ss_info_10de_0181_1462_8880 static const pciSubsystemInfo pci_ss_info_10de_0200_1043_402f = {0x1043, 0x402f, pci_subsys_10de_0200_1043_402f, 0}; #undef pci_ss_info_1043_402f @@ -19784,6 +20357,10 @@ static const pciSubsystemInfo pci_ss_info_1106_0571_1179_0001 = {0x1179, 0x0001, pci_subsys_1106_0571_1179_0001, 0}; #undef pci_ss_info_1179_0001 #define pci_ss_info_1179_0001 pci_ss_info_1106_0571_1179_0001 +static const pciSubsystemInfo pci_ss_info_1106_0571_1297_f641 = + {0x1297, 0xf641, pci_subsys_1106_0571_1297_f641, 0}; +#undef pci_ss_info_1297_f641 +#define pci_ss_info_1297_f641 pci_ss_info_1106_0571_1297_f641 static const pciSubsystemInfo pci_ss_info_1106_0571_1458_5002 = {0x1458, 0x5002, pci_subsys_1106_0571_1458_5002, 0}; #undef pci_ss_info_1458_5002 @@ -19872,6 +20449,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3038_1179_0001 = {0x1179, 0x0001, pci_subsys_1106_3038_1179_0001, 0}; #undef pci_ss_info_1179_0001 #define pci_ss_info_1179_0001 pci_ss_info_1106_3038_1179_0001 +static const pciSubsystemInfo pci_ss_info_1106_3038_1458_5004 = + {0x1458, 0x5004, pci_subsys_1106_3038_1458_5004, 0}; +#undef pci_ss_info_1458_5004 +#define pci_ss_info_1458_5004 pci_ss_info_1106_3038_1458_5004 static const pciSubsystemInfo pci_ss_info_1106_3043_10bd_0000 = {0x10bd, 0x0000, pci_subsys_1106_3043_10bd_0000, 0}; #undef pci_ss_info_10bd_0000 @@ -19938,6 +20519,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_1043_8095 = {0x1043, 0x8095, pci_subsys_1106_3059_1043_8095, 0}; #undef pci_ss_info_1043_8095 #define pci_ss_info_1043_8095 pci_ss_info_1106_3059_1043_8095 +static const pciSubsystemInfo pci_ss_info_1106_3059_1297_c160 = + {0x1297, 0xc160, pci_subsys_1106_3059_1297_c160, 0}; +#undef pci_ss_info_1297_c160 +#define pci_ss_info_1297_c160 pci_ss_info_1106_3059_1297_c160 static const pciSubsystemInfo pci_ss_info_1106_3059_1458_a002 = {0x1458, 0xa002, pci_subsys_1106_3059_1458_a002, 0}; #undef pci_ss_info_1458_a002 @@ -19974,14 +20559,26 @@ static const pciSubsystemInfo pci_ss_info_1106_3104_1043_808c = {0x1043, 0x808c, pci_subsys_1106_3104_1043_808c, 0}; #undef pci_ss_info_1043_808c #define pci_ss_info_1043_808c pci_ss_info_1106_3104_1043_808c +static const pciSubsystemInfo pci_ss_info_1106_3104_1297_f641 = + {0x1297, 0xf641, pci_subsys_1106_3104_1297_f641, 0}; +#undef pci_ss_info_1297_f641 +#define pci_ss_info_1297_f641 pci_ss_info_1106_3104_1297_f641 static const pciSubsystemInfo pci_ss_info_1106_3104_1458_5004 = {0x1458, 0x5004, pci_subsys_1106_3104_1458_5004, 0}; #undef pci_ss_info_1458_5004 #define pci_ss_info_1458_5004 pci_ss_info_1106_3104_1458_5004 +static const pciSubsystemInfo pci_ss_info_1106_3116_1297_f641 = + {0x1297, 0xf641, pci_subsys_1106_3116_1297_f641, 0}; +#undef pci_ss_info_1297_f641 +#define pci_ss_info_1297_f641 pci_ss_info_1106_3116_1297_f641 static const pciSubsystemInfo pci_ss_info_1106_3177_1043_808c = {0x1043, 0x808c, pci_subsys_1106_3177_1043_808c, 0}; #undef pci_ss_info_1043_808c #define pci_ss_info_1043_808c pci_ss_info_1106_3177_1043_808c +static const pciSubsystemInfo pci_ss_info_1106_3177_1297_f641 = + {0x1297, 0xf641, pci_subsys_1106_3177_1297_f641, 0}; +#undef pci_ss_info_1297_f641 +#define pci_ss_info_1297_f641 pci_ss_info_1106_3177_1297_f641 static const pciSubsystemInfo pci_ss_info_1106_3177_1458_5001 = {0x1458, 0x5001, pci_subsys_1106_3177_1458_5001, 0}; #undef pci_ss_info_1458_5001 @@ -20064,6 +20661,14 @@ static const pciSubsystemInfo pci_ss_info_1127_0400_1127_0400 = #define pci_ss_info_1127_0400 pci_ss_info_1127_0400_1127_0400 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1131_7130_5168_0138 = + {0x5168, 0x0138, pci_subsys_1131_7130_5168_0138, 0}; +#undef pci_ss_info_5168_0138 +#define pci_ss_info_5168_0138 pci_ss_info_1131_7130_5168_0138 +static const pciSubsystemInfo pci_ss_info_1131_7133_5168_0138 = + {0x5168, 0x0138, pci_subsys_1131_7133_5168_0138, 0}; +#undef pci_ss_info_5168_0138 +#define pci_ss_info_5168_0138 pci_ss_info_1131_7133_5168_0138 static const pciSubsystemInfo pci_ss_info_1131_7146_114b_2003 = {0x114b, 0x2003, pci_subsys_1131_7146_114b_2003, 0}; #undef pci_ss_info_114b_2003 @@ -20078,38 +20683,102 @@ static const pciSubsystemInfo pci_ss_info_1131_7146_11bd_000a = #define pci_ss_info_11bd_000a pci_ss_info_1131_7146_11bd_000a #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const pciSubsystemInfo pci_ss_info_1133_e001_1133_e001 = - {0x1133, 0xe001, pci_subsys_1133_e001_1133_e001, 0}; -#undef pci_ss_info_1133_e001 -#define pci_ss_info_1133_e001 pci_ss_info_1133_e001_1133_e001 -static const pciSubsystemInfo pci_ss_info_1133_e002_1133_e002 = - {0x1133, 0xe002, pci_subsys_1133_e002_1133_e002, 0}; -#undef pci_ss_info_1133_e002 -#define pci_ss_info_1133_e002 pci_ss_info_1133_e002_1133_e002 -static const pciSubsystemInfo pci_ss_info_1133_e003_1133_e003 = - {0x1133, 0xe003, pci_subsys_1133_e003_1133_e003, 0}; -#undef pci_ss_info_1133_e003 -#define pci_ss_info_1133_e003 pci_ss_info_1133_e003_1133_e003 -static const pciSubsystemInfo pci_ss_info_1133_e004_1133_e004 = - {0x1133, 0xe004, pci_subsys_1133_e004_1133_e004, 0}; -#undef pci_ss_info_1133_e004 -#define pci_ss_info_1133_e004 pci_ss_info_1133_e004_1133_e004 -static const pciSubsystemInfo pci_ss_info_1133_e005_1133_e005 = - {0x1133, 0xe005, pci_subsys_1133_e005_1133_e005, 0}; -#undef pci_ss_info_1133_e005 -#define pci_ss_info_1133_e005 pci_ss_info_1133_e005_1133_e005 -static const pciSubsystemInfo pci_ss_info_1133_e010_1133_e010 = - {0x1133, 0xe010, pci_subsys_1133_e010_1133_e010, 0}; -#undef pci_ss_info_1133_e010 -#define pci_ss_info_1133_e010 pci_ss_info_1133_e010_1133_e010 -static const pciSubsystemInfo pci_ss_info_1133_e012_1133_e012 = - {0x1133, 0xe012, pci_subsys_1133_e012_1133_e012, 0}; -#undef pci_ss_info_1133_e012 -#define pci_ss_info_1133_e012 pci_ss_info_1133_e012_1133_e012 -static const pciSubsystemInfo pci_ss_info_1133_e014_1133_e014 = - {0x1133, 0xe014, pci_subsys_1133_e014_1133_e014, 0}; -#undef pci_ss_info_1133_e014 -#define pci_ss_info_1133_e014 pci_ss_info_1133_e014_1133_e014 +static const pciSubsystemInfo pci_ss_info_1133_e010_110a_0021 = + {0x110a, 0x0021, pci_subsys_1133_e010_110a_0021, 0}; +#undef pci_ss_info_110a_0021 +#define pci_ss_info_110a_0021 pci_ss_info_1133_e010_110a_0021 +static const pciSubsystemInfo pci_ss_info_1133_e010_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e010_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e010_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e012_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e012_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e012_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e013_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e013_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e013_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e014_0008_0100 = + {0x0008, 0x0100, pci_subsys_1133_e014_0008_0100, 0}; +#undef pci_ss_info_0008_0100 +#define pci_ss_info_0008_0100 pci_ss_info_1133_e014_0008_0100 +static const pciSubsystemInfo pci_ss_info_1133_e014_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e014_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e014_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e015_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e015_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e015_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e016_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e016_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e016_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e017_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e017_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e017_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e018_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e018_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e018_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e019_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e019_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e019_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e01b_8001_0014 = + {0x8001, 0x0014, pci_subsys_1133_e01b_8001_0014, 0}; +#undef pci_ss_info_8001_0014 +#define pci_ss_info_8001_0014 pci_ss_info_1133_e01b_8001_0014 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c01 = + {0x1133, 0x1c01, pci_subsys_1133_e01c_1133_1c01, 0}; +#undef pci_ss_info_1133_1c01 +#define pci_ss_info_1133_1c01 pci_ss_info_1133_e01c_1133_1c01 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c02 = + {0x1133, 0x1c02, pci_subsys_1133_e01c_1133_1c02, 0}; +#undef pci_ss_info_1133_1c02 +#define pci_ss_info_1133_1c02 pci_ss_info_1133_e01c_1133_1c02 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c03 = + {0x1133, 0x1c03, pci_subsys_1133_e01c_1133_1c03, 0}; +#undef pci_ss_info_1133_1c03 +#define pci_ss_info_1133_1c03 pci_ss_info_1133_e01c_1133_1c03 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c04 = + {0x1133, 0x1c04, pci_subsys_1133_e01c_1133_1c04, 0}; +#undef pci_ss_info_1133_1c04 +#define pci_ss_info_1133_1c04 pci_ss_info_1133_e01c_1133_1c04 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c05 = + {0x1133, 0x1c05, pci_subsys_1133_e01c_1133_1c05, 0}; +#undef pci_ss_info_1133_1c05 +#define pci_ss_info_1133_1c05 pci_ss_info_1133_e01c_1133_1c05 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c06 = + {0x1133, 0x1c06, pci_subsys_1133_e01c_1133_1c06, 0}; +#undef pci_ss_info_1133_1c06 +#define pci_ss_info_1133_1c06 pci_ss_info_1133_e01c_1133_1c06 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c07 = + {0x1133, 0x1c07, pci_subsys_1133_e01c_1133_1c07, 0}; +#undef pci_ss_info_1133_1c07 +#define pci_ss_info_1133_1c07 pci_ss_info_1133_e01c_1133_1c07 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c08 = + {0x1133, 0x1c08, pci_subsys_1133_e01c_1133_1c08, 0}; +#undef pci_ss_info_1133_1c08 +#define pci_ss_info_1133_1c08 pci_ss_info_1133_e01c_1133_1c08 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c09 = + {0x1133, 0x1c09, pci_subsys_1133_e01c_1133_1c09, 0}; +#undef pci_ss_info_1133_1c09 +#define pci_ss_info_1133_1c09 pci_ss_info_1133_e01c_1133_1c09 +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0a = + {0x1133, 0x1c0a, pci_subsys_1133_e01c_1133_1c0a, 0}; +#undef pci_ss_info_1133_1c0a +#define pci_ss_info_1133_1c0a pci_ss_info_1133_e01c_1133_1c0a +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0b = + {0x1133, 0x1c0b, pci_subsys_1133_e01c_1133_1c0b, 0}; +#undef pci_ss_info_1133_1c0b +#define pci_ss_info_1133_1c0b pci_ss_info_1133_e01c_1133_1c0b +static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0c = + {0x1133, 0x1c0c, pci_subsys_1133_e01c_1133_1c0c, 0}; +#undef pci_ss_info_1133_1c0c +#define pci_ss_info_1133_1c0c pci_ss_info_1133_e01c_1133_1c0c #endif #ifdef VENDOR_INCLUDE_NONVIDEO #endif @@ -20410,6 +21079,28 @@ static const pciSubsystemInfo pci_ss_info_1163_2000_1092_2000 = #undef pci_ss_info_1092_2000 #define pci_ss_info_1092_2000 pci_ss_info_1163_2000_1092_2000 #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1166_0201_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1166_0201_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1166_0201_4c53_1080 +static const pciSubsystemInfo pci_ss_info_1166_0212_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1166_0212_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1166_0212_4c53_1080 +static const pciSubsystemInfo pci_ss_info_1166_0220_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1166_0220_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1166_0220_4c53_1080 +static const pciSubsystemInfo pci_ss_info_1166_0225_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1166_0225_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1166_0225_4c53_1080 +static const pciSubsystemInfo pci_ss_info_1166_0227_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_1166_0227_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_1166_0227_4c53_1080 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1179_0d01_1179_0001 = {0x1179, 0x0001, pci_subsys_1179_0d01_1179_0001, 0}; #undef pci_ss_info_1179_0001 @@ -20780,6 +21471,12 @@ static const pciSubsystemInfo pci_ss_info_11c1_044a_144f_1005 = {0x144f, 0x1005, pci_subsys_11c1_044a_144f_1005, 0}; #undef pci_ss_info_144f_1005 #define pci_ss_info_144f_1005 pci_ss_info_11c1_044a_144f_1005 +#endif +static const pciSubsystemInfo pci_ss_info_11c1_0450_1033_80a8 = + {0x1033, 0x80a8, pci_subsys_11c1_0450_1033_80a8, 0}; +#undef pci_ss_info_1033_80a8 +#define pci_ss_info_1033_80a8 pci_ss_info_11c1_0450_1033_80a8 +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_11c1_0450_144f_4005 = {0x144f, 0x4005, pci_subsys_11c1_0450_144f_4005, 0}; #undef pci_ss_info_144f_4005 @@ -21119,6 +21816,12 @@ static const pciSubsystemInfo pci_ss_info_125d_1989_125d_1989 = #undef pci_ss_info_125d_1989 #define pci_ss_info_125d_1989 pci_ss_info_125d_1989_125d_1989 #endif +static const pciSubsystemInfo pci_ss_info_125d_1998_1028_00b1 = + {0x1028, 0x00b1, pci_subsys_125d_1998_1028_00b1, 0}; +#undef pci_ss_info_1028_00b1 +#define pci_ss_info_1028_00b1 pci_ss_info_125d_1998_1028_00b1 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_125d_1998_1028_00e6 = {0x1028, 0x00e6, pci_subsys_125d_1998_1028_00e6, 0}; #undef pci_ss_info_1028_00e6 @@ -22166,6 +22869,10 @@ static const pciSubsystemInfo pci_ss_info_131f_2030_131f_2030 = #define pci_ss_info_131f_2030 pci_ss_info_131f_2030_131f_2030 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_134d_7890_134d_0001 = + {0x134d, 0x0001, pci_subsys_134d_7890_134d_0001, 0}; +#undef pci_ss_info_134d_0001 +#define pci_ss_info_134d_0001 pci_ss_info_134d_7890_134d_0001 static const pciSubsystemInfo pci_ss_info_134d_7891_134d_0001 = {0x134d, 0x0001, pci_subsys_134d_7891_134d_0001, 0}; #undef pci_ss_info_134d_0001 @@ -22206,6 +22913,10 @@ static const pciSubsystemInfo pci_ss_info_13f6_0111_1019_0970 = {0x1019, 0x0970, pci_subsys_13f6_0111_1019_0970, 0}; #undef pci_ss_info_1019_0970 #define pci_ss_info_1019_0970 pci_ss_info_13f6_0111_1019_0970 +static const pciSubsystemInfo pci_ss_info_13f6_0111_1043_8035 = + {0x1043, 0x8035, pci_subsys_13f6_0111_1043_8035, 0}; +#undef pci_ss_info_1043_8035 +#define pci_ss_info_1043_8035 pci_ss_info_13f6_0111_1043_8035 static const pciSubsystemInfo pci_ss_info_13f6_0111_1043_8077 = {0x1043, 0x8077, pci_subsys_13f6_0111_1043_8077, 0}; #undef pci_ss_info_1043_8077 @@ -22570,6 +23281,10 @@ static const pciSubsystemInfo pci_ss_info_14e4_16c7_14e4_000a = {0x14e4, 0x000a, pci_subsys_14e4_16c7_14e4_000a, 0}; #undef pci_ss_info_14e4_000a #define pci_ss_info_14e4_000a pci_ss_info_14e4_16c7_14e4_000a +static const pciSubsystemInfo pci_ss_info_14e4_4320_1737_4320 = + {0x1737, 0x4320, pci_subsys_14e4_4320_1737_4320, 0}; +#undef pci_ss_info_1737_4320 +#define pci_ss_info_1737_4320 pci_ss_info_14e4_4320_1737_4320 static const pciSubsystemInfo pci_ss_info_14e4_4401_1043_80a8 = {0x1043, 0x80a8, pci_subsys_14e4_4401_1043_80a8, 0}; #undef pci_ss_info_1043_80a8 @@ -22864,6 +23579,18 @@ static const pciSubsystemInfo pci_ss_info_1813_4100_16be_0002 = #define pci_ss_info_16be_0002 pci_ss_info_1813_4100_16be_0002 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_1050 = + {0x4c53, 0x1050, pci_subsys_3388_0021_4c53_1050, 0}; +#undef pci_ss_info_4c53_1050 +#define pci_ss_info_4c53_1050 pci_ss_info_3388_0021_4c53_1050 +static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_1080 = + {0x4c53, 0x1080, pci_subsys_3388_0021_4c53_1080, 0}; +#undef pci_ss_info_4c53_1080 +#define pci_ss_info_4c53_1080 pci_ss_info_3388_0021_4c53_1080 +static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_3010 = + {0x4c53, 0x3010, pci_subsys_3388_0021_4c53_3010, 0}; +#undef pci_ss_info_4c53_3010 +#define pci_ss_info_4c53_3010 pci_ss_info_3388_0021_4c53_3010 static const pciSubsystemInfo pci_ss_info_3388_8011_3388_8011 = {0x3388, 0x8011, pci_subsys_3388_8011_3388_8011, 0}; #undef pci_ss_info_3388_8011 @@ -24918,6 +25645,8 @@ static const pciSubsystemInfo *pci_ss_list_1000_000f[] = { &pci_ss_info_1000_000f_0e11_7004, &pci_ss_info_1000_000f_1092_8760, &pci_ss_info_1000_000f_1de1_3904, + &pci_ss_info_1000_000f_4c53_1000, + &pci_ss_info_1000_000f_4c53_1050, NULL }; static const pciSubsystemInfo *pci_ss_list_1000_0010[] = { @@ -24931,7 +25660,12 @@ static const pciSubsystemInfo *pci_ss_list_1000_0020[] = { &pci_ss_info_1000_0020_1de1_1020, NULL }; -#define pci_ss_list_1000_0021 NULL +static const pciSubsystemInfo *pci_ss_list_1000_0021[] = { + &pci_ss_info_1000_0021_4c53_1080, + &pci_ss_info_1000_0021_4c53_1300, + &pci_ss_info_1000_0021_4c53_1310, + NULL +}; static const pciSubsystemInfo *pci_ss_list_1000_0030[] = { &pci_ss_info_1000_0030_1028_1010, NULL @@ -24980,6 +25714,7 @@ static const pciSubsystemInfo *pci_ss_list_1000_1960[] = { #define pci_ss_list_1002_4146 NULL #define pci_ss_list_1002_4147 NULL #define pci_ss_list_1002_4158 NULL +#define pci_ss_list_1002_4164 NULL static const pciSubsystemInfo *pci_ss_list_1002_4242[] = { &pci_ss_info_1002_4242_1002_02aa, NULL @@ -25050,6 +25785,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_4752[] = { &pci_ss_info_1002_4752_1002_0008, &pci_ss_info_1002_4752_1002_4752, &pci_ss_info_1002_4752_1002_8008, + &pci_ss_info_1002_4752_1028_00ce, &pci_ss_info_1002_4752_1028_00d1, NULL }; @@ -25105,7 +25841,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c42[] = { }; #define pci_ss_list_1002_4c44 NULL #define pci_ss_list_1002_4c45 NULL -#define pci_ss_list_1002_4c46 NULL +static const pciSubsystemInfo *pci_ss_list_1002_4c46[] = { + &pci_ss_info_1002_4c46_1028_00b1, + NULL +}; #define pci_ss_list_1002_4c47 NULL static const pciSubsystemInfo *pci_ss_list_1002_4c49[] = { &pci_ss_info_1002_4c49_1002_0004, @@ -25116,8 +25855,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c49[] = { }; static const pciSubsystemInfo *pci_ss_list_1002_4c4d[] = { &pci_ss_info_1002_4c4d_0e11_b111, + &pci_ss_info_1002_4c4d_0e11_b160, &pci_ss_info_1002_4c4d_1002_0084, &pci_ss_info_1002_4c4d_1014_0154, + &pci_ss_info_1002_4c4d_1028_00aa, NULL }; #define pci_ss_list_1002_4c4e NULL @@ -25147,6 +25888,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c59[] = { #define pci_ss_list_1002_4c65 NULL #define pci_ss_list_1002_4c66 NULL #define pci_ss_list_1002_4c67 NULL +#define pci_ss_list_1002_4c6e NULL #define pci_ss_list_1002_4d46 NULL #define pci_ss_list_1002_4d4c NULL #define pci_ss_list_1002_4e44 NULL @@ -25158,7 +25900,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4e45[] = { #define pci_ss_list_1002_4e47 NULL #define pci_ss_list_1002_4e48 NULL #define pci_ss_list_1002_4e64 NULL -#define pci_ss_list_1002_4e65 NULL +static const pciSubsystemInfo *pci_ss_list_1002_4e65[] = { + &pci_ss_info_1002_4e65_1002_0003, + NULL +}; #define pci_ss_list_1002_4e66 NULL #define pci_ss_list_1002_4e67 NULL #define pci_ss_list_1002_4e68 NULL @@ -25343,8 +26088,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_5654[] = { }; #define pci_ss_list_1002_5655 NULL #define pci_ss_list_1002_5656 NULL +#define pci_ss_list_1002_5961 NULL #define pci_ss_list_1002_700f NULL #define pci_ss_list_1002_7010 NULL +#define pci_ss_list_1002_cab0 NULL #define pci_ss_list_1002_cab2 NULL #define pci_ss_list_1003_0201 NULL #define pci_ss_list_1004_0005 NULL @@ -25398,8 +26145,17 @@ static const pciSubsystemInfo *pci_ss_list_1004_0306[] = { #define pci_ss_list_100b_000f NULL #define pci_ss_list_100b_0011 NULL #define pci_ss_list_100b_0012 NULL -#define pci_ss_list_100b_0020 NULL +static const pciSubsystemInfo *pci_ss_list_100b_0020[] = { + &pci_ss_info_100b_0020_1385_f311, + NULL +}; #define pci_ss_list_100b_0022 NULL +#define pci_ss_list_100b_0028 NULL +#define pci_ss_list_100b_002b NULL +#define pci_ss_list_100b_002d NULL +#define pci_ss_list_100b_002e NULL +#define pci_ss_list_100b_002f NULL +#define pci_ss_list_100b_0030 NULL #define pci_ss_list_100b_0500 NULL #define pci_ss_list_100b_0501 NULL #define pci_ss_list_100b_0502 NULL @@ -25505,6 +26261,8 @@ static const pciSubsystemInfo *pci_ss_list_1011_0046[] = { &pci_ss_info_1011_0046_0e11_4058, &pci_ss_info_1011_0046_103c_10c2, &pci_ss_info_1011_0046_12d9_000a, + &pci_ss_info_1011_0046_4c53_1050, + &pci_ss_info_1011_0046_4c53_1051, &pci_ss_info_1011_0046_9005_0365, &pci_ss_info_1011_0046_9005_1364, &pci_ss_info_1011_0046_9005_1365, @@ -25589,8 +26347,10 @@ static const pciSubsystemInfo *pci_ss_list_1014_002e[] = { &pci_ss_info_1014_002e_1014_022e, NULL }; +#define pci_ss_list_1014_0031 NULL #define pci_ss_list_1014_0036 NULL #define pci_ss_list_1014_003a NULL +#define pci_ss_list_1014_003c NULL static const pciSubsystemInfo *pci_ss_list_1014_003e[] = { &pci_ss_info_1014_003e_1014_003e, &pci_ss_info_1014_003e_1014_00cd, @@ -25610,14 +26370,18 @@ static const pciSubsystemInfo *pci_ss_list_1014_003e[] = { #define pci_ss_list_1014_004f NULL #define pci_ss_list_1014_0050 NULL #define pci_ss_list_1014_0053 NULL +#define pci_ss_list_1014_0054 NULL #define pci_ss_list_1014_0057 NULL #define pci_ss_list_1014_005c NULL +#define pci_ss_list_1014_005e NULL #define pci_ss_list_1014_007c NULL #define pci_ss_list_1014_007d NULL +#define pci_ss_list_1014_008e NULL static const pciSubsystemInfo *pci_ss_list_1014_0090[] = { &pci_ss_info_1014_0090_1014_008e, NULL }; +#define pci_ss_list_1014_0091 NULL #define pci_ss_list_1014_0095 NULL static const pciSubsystemInfo *pci_ss_list_1014_0096[] = { &pci_ss_info_1014_0096_1014_0097, @@ -25625,12 +26389,15 @@ static const pciSubsystemInfo *pci_ss_list_1014_0096[] = { &pci_ss_info_1014_0096_1014_0099, NULL }; +#define pci_ss_list_1014_009f NULL #define pci_ss_list_1014_00a5 NULL #define pci_ss_list_1014_00a6 NULL #define pci_ss_list_1014_00b7 NULL +#define pci_ss_list_1014_00b8 NULL #define pci_ss_list_1014_00be NULL #define pci_ss_list_1014_00dc NULL #define pci_ss_list_1014_00fc NULL +#define pci_ss_list_1014_0104 NULL #define pci_ss_list_1014_0105 NULL #define pci_ss_list_1014_010f NULL static const pciSubsystemInfo *pci_ss_list_1014_0142[] = { @@ -25642,6 +26409,16 @@ static const pciSubsystemInfo *pci_ss_list_1014_0144[] = { NULL }; #define pci_ss_list_1014_0156 NULL +#define pci_ss_list_1014_015e NULL +#define pci_ss_list_1014_0160 NULL +#define pci_ss_list_1014_016e NULL +#define pci_ss_list_1014_0170 NULL +#define pci_ss_list_1014_017d NULL +static const pciSubsystemInfo *pci_ss_list_1014_0180[] = { + &pci_ss_info_1014_0180_1014_0241, + &pci_ss_info_1014_0180_1014_0264, + NULL +}; #define pci_ss_list_1014_01a7 NULL static const pciSubsystemInfo *pci_ss_list_1014_01bd[] = { &pci_ss_info_1014_01bd_1014_01be, @@ -25653,6 +26430,21 @@ static const pciSubsystemInfo *pci_ss_list_1014_01bd[] = { &pci_ss_info_1014_01bd_1014_0259, NULL }; +#define pci_ss_list_1014_01c1 NULL +#define pci_ss_list_1014_01e6 NULL +#define pci_ss_list_1014_01ff NULL +static const pciSubsystemInfo *pci_ss_list_1014_0219[] = { + &pci_ss_info_1014_0219_1014_021a, + &pci_ss_info_1014_0219_1014_0251, + &pci_ss_info_1014_0219_1014_0252, + NULL +}; +#define pci_ss_list_1014_021b NULL +#define pci_ss_list_1014_021c NULL +#define pci_ss_list_1014_0233 NULL +#define pci_ss_list_1014_0266 NULL +#define pci_ss_list_1014_0268 NULL +#define pci_ss_list_1014_0269 NULL #define pci_ss_list_1014_0302 NULL #define pci_ss_list_1014_ffff NULL #endif @@ -25709,6 +26501,12 @@ static const pciSubsystemInfo *pci_ss_list_1022_2000[] = { &pci_ss_info_1022_2000_1259_2454, &pci_ss_info_1022_2000_1259_2700, &pci_ss_info_1022_2000_1259_2701, + &pci_ss_info_1022_2000_4c53_1000, + &pci_ss_info_1022_2000_4c53_1010, + &pci_ss_info_1022_2000_4c53_1020, + &pci_ss_info_1022_2000_4c53_1030, + &pci_ss_info_1022_2000_4c53_1040, + &pci_ss_info_1022_2000_4c53_1060, NULL }; static const pciSubsystemInfo *pci_ss_list_1022_2001[] = { @@ -25716,6 +26514,7 @@ static const pciSubsystemInfo *pci_ss_list_1022_2001[] = { &pci_ss_info_1022_2001_1668_0299, NULL }; +#define pci_ss_list_1022_2003 NULL #define pci_ss_list_1022_2020 NULL #define pci_ss_list_1022_2040 NULL #define pci_ss_list_1022_3000 NULL @@ -25764,6 +26563,7 @@ static const pciSubsystemInfo *pci_ss_list_1022_7443[] = { #define pci_ss_list_1022_746b NULL #define pci_ss_list_1022_746d NULL #define pci_ss_list_1022_746e NULL +#define pci_ss_list_1022_756b NULL #define pci_ss_list_1023_0194 NULL #define pci_ss_list_1023_2000 NULL #define pci_ss_list_1023_2001 NULL @@ -26075,6 +26875,12 @@ static const pciSubsystemInfo *pci_ss_list_102b_2527[] = { #define pci_ss_list_102c_00b8 NULL static const pciSubsystemInfo *pci_ss_list_102c_00c0[] = { &pci_ss_info_102c_00c0_102c_00c0, + &pci_ss_info_102c_00c0_4c53_1000, + &pci_ss_info_102c_00c0_4c53_1010, + &pci_ss_info_102c_00c0_4c53_1020, + &pci_ss_info_102c_00c0_4c53_1030, + &pci_ss_info_102c_00c0_4c53_1050, + &pci_ss_info_102c_00c0_4c53_1051, NULL }; #define pci_ss_list_102c_00d0 NULL @@ -26089,7 +26895,13 @@ static const pciSubsystemInfo *pci_ss_list_102c_00e5[] = { #define pci_ss_list_102c_00f0 NULL #define pci_ss_list_102c_00f4 NULL #define pci_ss_list_102c_00f5 NULL -#define pci_ss_list_102c_0c30 NULL +static const pciSubsystemInfo *pci_ss_list_102c_0c30[] = { + &pci_ss_info_102c_0c30_4c53_1000, + &pci_ss_info_102c_0c30_4c53_1050, + &pci_ss_info_102c_0c30_4c53_1051, + &pci_ss_info_102c_0c30_4c53_1080, + NULL +}; #define pci_ss_list_102d_50dc NULL #define pci_ss_list_102f_0009 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -26102,6 +26914,7 @@ static const pciSubsystemInfo *pci_ss_list_102f_0020[] = { #define pci_ss_list_1031_5607 NULL #define pci_ss_list_1031_5631 NULL #define pci_ss_list_1031_6057 NULL +#define pci_ss_list_1033_0000 NULL #define pci_ss_list_1033_0001 NULL #define pci_ss_list_1033_0002 NULL #define pci_ss_list_1033_0003 NULL @@ -26150,11 +26963,13 @@ static const pciSubsystemInfo *pci_ss_list_1033_00cd[] = { &pci_ss_info_1033_00cd_12ee_8011, NULL }; +#define pci_ss_list_1033_00df NULL static const pciSubsystemInfo *pci_ss_list_1033_00e0[] = { &pci_ss_info_1033_00e0_12ee_7001, &pci_ss_info_1033_00e0_1799_0002, NULL }; +#define pci_ss_list_1033_00f3 NULL #define pci_ss_list_1036_0000 NULL #define pci_ss_list_1039_0001 NULL #define pci_ss_list_1039_0002 NULL @@ -26196,9 +27011,11 @@ static const pciSubsystemInfo *pci_ss_list_1039_0300[] = { #define pci_ss_list_1039_0735 NULL #define pci_ss_list_1039_0740 NULL #define pci_ss_list_1039_0745 NULL +#define pci_ss_list_1039_0746 NULL #define pci_ss_list_1039_0755 NULL static const pciSubsystemInfo *pci_ss_list_1039_0900[] = { &pci_ss_info_1039_0900_1039_0900, + &pci_ss_info_1039_0900_1043_8035, NULL }; #define pci_ss_list_1039_0961 NULL @@ -26212,6 +27029,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_0900[] = { static const pciSubsystemInfo *pci_ss_list_1039_5513[] = { &pci_ss_info_1039_5513_1019_0970, &pci_ss_info_1039_5513_1039_5513, + &pci_ss_info_1039_5513_1043_8035, NULL }; #define pci_ss_list_1039_5517 NULL @@ -26227,6 +27045,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_5513[] = { #define pci_ss_list_1039_6236 NULL static const pciSubsystemInfo *pci_ss_list_1039_6300[] = { &pci_ss_info_1039_6300_1019_0970, + &pci_ss_info_1039_6300_1043_8035, NULL }; static const pciSubsystemInfo *pci_ss_list_1039_6306[] = { @@ -26283,6 +27102,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_7018[] = { &pci_ss_info_1039_7018_a0a0_0022, NULL }; +#define pci_ss_list_1039_7019 NULL #define pci_ss_list_103c_1005 NULL #define pci_ss_list_103c_1006 NULL #define pci_ss_list_103c_1008 NULL @@ -26343,6 +27163,7 @@ static const pciSubsystemInfo *pci_ss_list_103c_1048[] = { #define pci_ss_list_1042_3020 NULL #define pci_ss_list_1043_0675 NULL #define pci_ss_list_1043_4021 NULL +#define pci_ss_list_1043_4057 NULL #define pci_ss_list_1044_1012 NULL #define pci_ss_list_1044_a400 NULL #define pci_ss_list_1044_a500 NULL @@ -26415,11 +27236,18 @@ static const pciSubsystemInfo *pci_ss_list_1044_a501[] = { #define pci_ss_list_104a_0008 NULL #define pci_ss_list_104a_0009 NULL #define pci_ss_list_104a_0010 NULL +#define pci_ss_list_104a_0209 NULL +#define pci_ss_list_104a_020a NULL #define pci_ss_list_104a_0210 NULL +#define pci_ss_list_104a_021a NULL +#define pci_ss_list_104a_021b NULL +#define pci_ss_list_104a_0500 NULL +#define pci_ss_list_104a_0564 NULL #define pci_ss_list_104a_0981 NULL #define pci_ss_list_104a_1746 NULL #define pci_ss_list_104a_2774 NULL #define pci_ss_list_104a_3520 NULL +#define pci_ss_list_104a_55cc NULL #define pci_ss_list_104b_0140 NULL #define pci_ss_list_104b_1040 NULL #define pci_ss_list_104b_8130 NULL @@ -26482,7 +27310,10 @@ static const pciSubsystemInfo *pci_ss_list_104c_8027[] = { &pci_ss_info_104c_8027_1028_00e6, NULL }; +#define pci_ss_list_104c_8029 NULL #define pci_ss_list_104c_8400 NULL +#define pci_ss_list_104c_8401 NULL +#define pci_ss_list_104c_9000 NULL #define pci_ss_list_104c_a001 NULL #define pci_ss_list_104c_a100 NULL #define pci_ss_list_104c_a102 NULL @@ -26501,7 +27332,10 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac1b[] = { &pci_ss_info_104c_ac1b_0e11_b113, NULL }; -#define pci_ss_list_104c_ac1c NULL +static const pciSubsystemInfo *pci_ss_list_104c_ac1c[] = { + &pci_ss_info_104c_ac1c_0e11_b121, + NULL +}; #define pci_ss_list_104c_ac1d NULL #define pci_ss_list_104c_ac1e NULL #define pci_ss_list_104c_ac1f NULL @@ -26517,9 +27351,11 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac42[] = { &pci_ss_info_104c_ac42_1028_00e6, NULL }; +#define pci_ss_list_104c_ac44 NULL #define pci_ss_list_104c_ac50 NULL static const pciSubsystemInfo *pci_ss_list_104c_ac51[] = { &pci_ss_info_104c_ac51_1014_023b, + &pci_ss_info_104c_ac51_1028_00b1, &pci_ss_info_104c_ac51_10cf_1095, &pci_ss_info_104c_ac51_e4bf_1000, NULL @@ -26610,6 +27446,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_0d38[] = { NULL }; #define pci_ss_list_105a_1275 NULL +#define pci_ss_list_105a_3318 NULL static const pciSubsystemInfo *pci_ss_list_105a_3376[] = { &pci_ss_info_105a_3376_1043_809e, NULL @@ -26648,6 +27485,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_6269[] = { NULL }; #define pci_ss_list_105a_6621 NULL +#define pci_ss_list_105a_6629 NULL #define pci_ss_list_105a_7275 NULL #endif #define pci_ss_list_105d_2309 NULL @@ -26726,6 +27564,7 @@ static const pciSubsystemInfo *pci_ss_list_105d_5348[] = { #define pci_ss_list_1069_0002 NULL #define pci_ss_list_1069_0010 NULL #define pci_ss_list_1069_0050 NULL +#define pci_ss_list_1069_b166 NULL #define pci_ss_list_1069_ba55 NULL #define pci_ss_list_1069_ba56 NULL #define pci_ss_list_106b_0001 NULL @@ -26949,6 +27788,8 @@ static const pciSubsystemInfo *pci_ss_list_108d_0019[] = { #define pci_ss_list_1093_1190 NULL #define pci_ss_list_1093_1330 NULL #define pci_ss_list_1093_1350 NULL +#define pci_ss_list_1093_17d0 NULL +#define pci_ss_list_1093_2410 NULL #define pci_ss_list_1093_2a60 NULL #define pci_ss_list_1093_b001 NULL #define pci_ss_list_1093_b011 NULL @@ -27215,6 +28056,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9050[] = { }; static const pciSubsystemInfo *pci_ss_list_10b5_9054[] = { &pci_ss_info_10b5_9054_10b5_2455, + &pci_ss_info_10b5_9054_10b5_2696, &pci_ss_info_10b5_9054_12d9_0002, NULL }; @@ -27230,6 +28072,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9080[] = { &pci_ss_info_10b5_9080_12d9_0002, NULL }; +#define pci_ss_list_10b5_bb04 NULL #endif #define pci_ss_list_10b6_0001 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -27281,6 +28124,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_1007[] = { &pci_ss_info_10b7_1007_10b7_615c, NULL }; +#define pci_ss_list_10b7_1700 NULL #define pci_ss_list_10b7_3390 NULL static const pciSubsystemInfo *pci_ss_list_10b7_3590[] = { &pci_ss_info_10b7_3590_10b7_3590, @@ -27333,6 +28177,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_6563[] = { }; #define pci_ss_list_10b7_6564 NULL #define pci_ss_list_10b7_7646 NULL +#define pci_ss_list_10b7_7770 NULL #define pci_ss_list_10b7_7940 NULL #define pci_ss_list_10b7_7980 NULL #define pci_ss_list_10b7_7990 NULL @@ -27380,6 +28225,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_9055[] = { #define pci_ss_list_10b7_905a NULL static const pciSubsystemInfo *pci_ss_list_10b7_9200[] = { &pci_ss_info_10b7_9200_1028_0095, + &pci_ss_info_10b7_9200_1028_0097, &pci_ss_info_10b7_9200_10b7_1000, &pci_ss_info_10b7_9200_10b7_7000, NULL @@ -27583,6 +28429,8 @@ static const pciSubsystemInfo *pci_ss_list_10c8_8005[] = { }; #define pci_ss_list_10c8_8006 NULL #define pci_ss_list_10c8_8016 NULL +#define pci_ss_list_10cc_0660 NULL +#define pci_ss_list_10cc_0661 NULL #define pci_ss_list_10cd_1100 NULL #define pci_ss_list_10cd_1200 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -27708,11 +28556,23 @@ static const pciSubsystemInfo *pci_ss_list_10de_0068[] = { }; #define pci_ss_list_10de_006a NULL #define pci_ss_list_10de_006b NULL +#define pci_ss_list_10de_006c NULL +#define pci_ss_list_10de_006d NULL #define pci_ss_list_10de_006e NULL static const pciSubsystemInfo *pci_ss_list_10de_00a0[] = { &pci_ss_info_10de_00a0_14af_5810, NULL }; +#define pci_ss_list_10de_00d0 NULL +#define pci_ss_list_10de_00d1 NULL +#define pci_ss_list_10de_00d2 NULL +#define pci_ss_list_10de_00d4 NULL +#define pci_ss_list_10de_00d5 NULL +#define pci_ss_list_10de_00d6 NULL +#define pci_ss_list_10de_00d7 NULL +#define pci_ss_list_10de_00d8 NULL +#define pci_ss_list_10de_00da NULL +#define pci_ss_list_10de_00dd NULL static const pciSubsystemInfo *pci_ss_list_10de_0100[] = { &pci_ss_info_10de_0100_1043_0200, &pci_ss_info_10de_0100_1043_0201, @@ -27726,6 +28586,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0101[] = { &pci_ss_info_10de_0101_1043_0202, &pci_ss_info_10de_0101_1043_400a, &pci_ss_info_10de_0101_1043_400b, + &pci_ss_info_10de_0101_107d_2822, &pci_ss_info_10de_0101_1102_102e, &pci_ss_info_10de_0101_14af_5021, NULL @@ -27775,7 +28636,11 @@ static const pciSubsystemInfo *pci_ss_list_10de_0171[] = { #define pci_ss_list_10de_017a NULL #define pci_ss_list_10de_017b NULL #define pci_ss_list_10de_017c NULL -#define pci_ss_list_10de_0181 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0181[] = { + &pci_ss_info_10de_0181_1043_806f, + &pci_ss_info_10de_0181_1462_8880, + NULL +}; #define pci_ss_list_10de_0182 NULL #define pci_ss_list_10de_0183 NULL #define pci_ss_list_10de_0188 NULL @@ -27795,7 +28660,14 @@ static const pciSubsystemInfo *pci_ss_list_10de_0171[] = { #define pci_ss_list_10de_01c1 NULL #define pci_ss_list_10de_01c2 NULL #define pci_ss_list_10de_01c3 NULL +#define pci_ss_list_10de_01e0 NULL #define pci_ss_list_10de_01e8 NULL +#define pci_ss_list_10de_01ea NULL +#define pci_ss_list_10de_01eb NULL +#define pci_ss_list_10de_01ec NULL +#define pci_ss_list_10de_01ed NULL +#define pci_ss_list_10de_01ee NULL +#define pci_ss_list_10de_01ef NULL #define pci_ss_list_10de_01f0 NULL static const pciSubsystemInfo *pci_ss_list_10de_0200[] = { &pci_ss_info_10de_0200_1043_402f, @@ -27822,6 +28694,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = { #define pci_ss_list_10de_0280 NULL #define pci_ss_list_10de_0281 NULL #define pci_ss_list_10de_0282 NULL +#define pci_ss_list_10de_0286 NULL #define pci_ss_list_10de_0288 NULL #define pci_ss_list_10de_0289 NULL #define pci_ss_list_10de_0300 NULL @@ -27829,6 +28702,31 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = { #define pci_ss_list_10de_0302 NULL #define pci_ss_list_10de_0308 NULL #define pci_ss_list_10de_0309 NULL +#define pci_ss_list_10de_0311 NULL +#define pci_ss_list_10de_0312 NULL +#define pci_ss_list_10de_0314 NULL +#define pci_ss_list_10de_031a NULL +#define pci_ss_list_10de_031b NULL +#define pci_ss_list_10de_031c NULL +#define pci_ss_list_10de_0321 NULL +#define pci_ss_list_10de_0322 NULL +#define pci_ss_list_10de_0323 NULL +#define pci_ss_list_10de_0324 NULL +#define pci_ss_list_10de_0325 NULL +#define pci_ss_list_10de_0328 NULL +#define pci_ss_list_10de_0329 NULL +#define pci_ss_list_10de_032a NULL +#define pci_ss_list_10de_032b NULL +#define pci_ss_list_10de_032c NULL +#define pci_ss_list_10de_032d NULL +#define pci_ss_list_10de_0330 NULL +#define pci_ss_list_10de_0331 NULL +#define pci_ss_list_10de_0332 NULL +#define pci_ss_list_10de_0333 NULL +#define pci_ss_list_10de_0338 NULL +#define pci_ss_list_10de_0341 NULL +#define pci_ss_list_10de_0342 NULL +#define pci_ss_list_10de_034e NULL #define pci_ss_list_10df_1ae5 NULL #define pci_ss_list_10df_f085 NULL #define pci_ss_list_10df_f095 NULL @@ -27869,6 +28767,7 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = { #define pci_ss_list_10e8_811a NULL #define pci_ss_list_10e8_8170 NULL #define pci_ss_list_10e8_82db NULL +#define pci_ss_list_10e8_8851 NULL #define pci_ss_list_10ea_1680 NULL #define pci_ss_list_10ea_1682 NULL #define pci_ss_list_10ea_1683 NULL @@ -27934,6 +28833,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8169[] = { #define pci_ss_list_10ee_3fc3 NULL #define pci_ss_list_10ee_3fc4 NULL #define pci_ss_list_10ee_3fc5 NULL +#define pci_ss_list_10ee_8381 NULL #define pci_ss_list_10ef_8154 NULL #define pci_ss_list_10f5_a001 NULL #define pci_ss_list_10fa_000c NULL @@ -28024,6 +28924,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_0571[] = { &pci_ss_info_1106_0571_1043_808c, &pci_ss_info_1106_0571_1106_0571, &pci_ss_info_1106_0571_1179_0001, + &pci_ss_info_1106_0571_1297_f641, &pci_ss_info_1106_0571_1458_5002, NULL }; @@ -28078,6 +28979,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3038[] = { &pci_ss_info_1106_3038_1019_0985, &pci_ss_info_1106_3038_1043_808c, &pci_ss_info_1106_3038_1179_0001, + &pci_ss_info_1106_3038_1458_5004, NULL }; #define pci_ss_list_1106_3040 NULL @@ -28110,6 +29012,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3058[] = { }; static const pciSubsystemInfo *pci_ss_list_1106_3059[] = { &pci_ss_info_1106_3059_1043_8095, + &pci_ss_info_1106_3059_1297_c160, &pci_ss_info_1106_3059_1458_a002, NULL }; @@ -28136,13 +29039,17 @@ static const pciSubsystemInfo *pci_ss_list_1106_3099[] = { #define pci_ss_list_1106_3103 NULL static const pciSubsystemInfo *pci_ss_list_1106_3104[] = { &pci_ss_info_1106_3104_1043_808c, + &pci_ss_info_1106_3104_1297_f641, &pci_ss_info_1106_3104_1458_5004, NULL }; #define pci_ss_list_1106_3106 NULL #define pci_ss_list_1106_3109 NULL #define pci_ss_list_1106_3112 NULL -#define pci_ss_list_1106_3116 NULL +static const pciSubsystemInfo *pci_ss_list_1106_3116[] = { + &pci_ss_info_1106_3116_1297_f641, + NULL +}; #define pci_ss_list_1106_3122 NULL #define pci_ss_list_1106_3123 NULL #define pci_ss_list_1106_3128 NULL @@ -28153,6 +29060,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3104[] = { #define pci_ss_list_1106_3168 NULL static const pciSubsystemInfo *pci_ss_list_1106_3177[] = { &pci_ss_info_1106_3177_1043_808c, + &pci_ss_info_1106_3177_1297_f641, &pci_ss_info_1106_3177_1458_5001, NULL }; @@ -28185,6 +29093,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_8598[] = { #define pci_ss_list_1106_b103 NULL #define pci_ss_list_1106_b112 NULL #define pci_ss_list_1106_b168 NULL +#define pci_ss_list_1106_b198 NULL #endif #define pci_ss_list_1107_0576 NULL #define pci_ss_list_1108_0100 NULL @@ -28205,6 +29114,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_8598[] = { #define pci_ss_list_110a_007c NULL #define pci_ss_list_110a_007d NULL #define pci_ss_list_110a_2102 NULL +#define pci_ss_list_110a_4021 NULL #define pci_ss_list_110a_4942 NULL #define pci_ss_list_110a_6120 NULL #define pci_ss_list_110b_0001 NULL @@ -28354,12 +29264,18 @@ static const pciSubsystemInfo *pci_ss_list_1127_0400[] = { #define pci_ss_list_1131_1561 NULL #define pci_ss_list_1131_1562 NULL #define pci_ss_list_1131_3400 NULL -#define pci_ss_list_1131_7130 NULL -#define pci_ss_list_1131_7133 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1131_7130[] = { + &pci_ss_info_1131_7130_5168_0138, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1131_7133[] = { + &pci_ss_info_1131_7133_5168_0138, + NULL +}; #define pci_ss_list_1131_7134 NULL #define pci_ss_list_1131_7135 NULL #define pci_ss_list_1131_7145 NULL -#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1131_7146[] = { &pci_ss_info_1131_7146_114b_2003, &pci_ss_info_1131_7146_11bd_0006, @@ -28378,41 +29294,82 @@ static const pciSubsystemInfo *pci_ss_list_1131_7146[] = { #define pci_ss_list_1133_b921 NULL #define pci_ss_list_1133_b922 NULL #define pci_ss_list_1133_b923 NULL -#ifdef VENDOR_INCLUDE_NONVIDEO -static const pciSubsystemInfo *pci_ss_list_1133_e001[] = { - &pci_ss_info_1133_e001_1133_e001, - NULL -}; -static const pciSubsystemInfo *pci_ss_list_1133_e002[] = { - &pci_ss_info_1133_e002_1133_e002, - NULL -}; -static const pciSubsystemInfo *pci_ss_list_1133_e003[] = { - &pci_ss_info_1133_e003_1133_e003, - NULL -}; -static const pciSubsystemInfo *pci_ss_list_1133_e004[] = { - &pci_ss_info_1133_e004_1133_e004, - NULL -}; -static const pciSubsystemInfo *pci_ss_list_1133_e005[] = { - &pci_ss_info_1133_e005_1133_e005, - NULL -}; +#define pci_ss_list_1133_e001 NULL +#define pci_ss_list_1133_e002 NULL +#define pci_ss_list_1133_e003 NULL +#define pci_ss_list_1133_e004 NULL +#define pci_ss_list_1133_e005 NULL +#define pci_ss_list_1133_e006 NULL +#define pci_ss_list_1133_e007 NULL +#define pci_ss_list_1133_e008 NULL +#define pci_ss_list_1133_e009 NULL +#define pci_ss_list_1133_e00a NULL #define pci_ss_list_1133_e00b NULL +#define pci_ss_list_1133_e00c NULL +#define pci_ss_list_1133_e00d NULL +#define pci_ss_list_1133_e00e NULL +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1133_e010[] = { - &pci_ss_info_1133_e010_1133_e010, + &pci_ss_info_1133_e010_110a_0021, + &pci_ss_info_1133_e010_8001_0014, NULL }; +#define pci_ss_list_1133_e011 NULL static const pciSubsystemInfo *pci_ss_list_1133_e012[] = { - &pci_ss_info_1133_e012_1133_e012, + &pci_ss_info_1133_e012_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e013[] = { + &pci_ss_info_1133_e013_8001_0014, NULL }; static const pciSubsystemInfo *pci_ss_list_1133_e014[] = { - &pci_ss_info_1133_e014_1133_e014, + &pci_ss_info_1133_e014_0008_0100, + &pci_ss_info_1133_e014_8001_0014, NULL }; -#define pci_ss_list_1133_e018 NULL +static const pciSubsystemInfo *pci_ss_list_1133_e015[] = { + &pci_ss_info_1133_e015_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e016[] = { + &pci_ss_info_1133_e016_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e017[] = { + &pci_ss_info_1133_e017_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e018[] = { + &pci_ss_info_1133_e018_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e019[] = { + &pci_ss_info_1133_e019_8001_0014, + NULL +}; +#define pci_ss_list_1133_e01a NULL +static const pciSubsystemInfo *pci_ss_list_1133_e01b[] = { + &pci_ss_info_1133_e01b_8001_0014, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1133_e01c[] = { + &pci_ss_info_1133_e01c_1133_1c01, + &pci_ss_info_1133_e01c_1133_1c02, + &pci_ss_info_1133_e01c_1133_1c03, + &pci_ss_info_1133_e01c_1133_1c04, + &pci_ss_info_1133_e01c_1133_1c05, + &pci_ss_info_1133_e01c_1133_1c06, + &pci_ss_info_1133_e01c_1133_1c07, + &pci_ss_info_1133_e01c_1133_1c08, + &pci_ss_info_1133_e01c_1133_1c09, + &pci_ss_info_1133_e01c_1133_1c0a, + &pci_ss_info_1133_e01c_1133_1c0b, + &pci_ss_info_1133_e01c_1133_1c0c, + NULL +}; +#define pci_ss_list_1133_e01e NULL +#define pci_ss_list_1133_e020 NULL #endif #define pci_ss_list_1134_0001 NULL #define pci_ss_list_1135_0001 NULL @@ -28614,15 +29571,32 @@ static const pciSubsystemInfo *pci_ss_list_1163_2000[] = { #define pci_ss_list_1166_0016 NULL #define pci_ss_list_1166_0017 NULL #define pci_ss_list_1166_0200 NULL -#define pci_ss_list_1166_0201 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1166_0201[] = { + &pci_ss_info_1166_0201_4c53_1080, + NULL +}; #define pci_ss_list_1166_0203 NULL #define pci_ss_list_1166_0211 NULL -#define pci_ss_list_1166_0212 NULL +static const pciSubsystemInfo *pci_ss_list_1166_0212[] = { + &pci_ss_info_1166_0212_4c53_1080, + NULL +}; #define pci_ss_list_1166_0213 NULL -#define pci_ss_list_1166_0220 NULL +static const pciSubsystemInfo *pci_ss_list_1166_0220[] = { + &pci_ss_info_1166_0220_4c53_1080, + NULL +}; #define pci_ss_list_1166_0221 NULL -#define pci_ss_list_1166_0225 NULL -#define pci_ss_list_1166_0227 NULL +static const pciSubsystemInfo *pci_ss_list_1166_0225[] = { + &pci_ss_info_1166_0225_4c53_1080, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1166_0227[] = { + &pci_ss_info_1166_0227_4c53_1080, + NULL +}; +#endif #define pci_ss_list_116a_6100 NULL #define pci_ss_list_116a_6800 NULL #define pci_ss_list_116a_7100 NULL @@ -28857,6 +29831,7 @@ static const pciSubsystemInfo *pci_ss_list_11c1_044a[] = { #define pci_ss_list_11c1_044e NULL #define pci_ss_list_11c1_044f NULL static const pciSubsystemInfo *pci_ss_list_11c1_0450[] = { + &pci_ss_info_11c1_0450_1033_80a8, &pci_ss_info_11c1_0450_144f_4005, NULL }; @@ -29087,6 +30062,8 @@ static const pciSubsystemInfo *pci_ss_list_1242_1560[] = { NULL }; #define pci_ss_list_1242_4643 NULL +#define pci_ss_list_1242_6562 NULL +#define pci_ss_list_1242_656a NULL #endif #define pci_ss_list_1244_0700 NULL #define pci_ss_list_1244_0800 NULL @@ -29152,6 +30129,7 @@ static const pciSubsystemInfo *pci_ss_list_125d_1989[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_125d_1998[] = { + &pci_ss_info_125d_1998_1028_00b1, &pci_ss_info_125d_1998_1028_00e6, NULL }; @@ -29533,6 +30511,7 @@ static const pciSubsystemInfo *pci_ss_list_12d2_0018[] = { #define pci_ss_list_12d4_0200 NULL #define pci_ss_list_12d9_0002 NULL #define pci_ss_list_12d9_0004 NULL +#define pci_ss_list_12de_0200 NULL #define pci_ss_list_12e0_0010 NULL #define pci_ss_list_12e0_0020 NULL #define pci_ss_list_12e0_0030 NULL @@ -29673,12 +30652,19 @@ static const pciSubsystemInfo *pci_ss_list_131f_2030[] = { #define pci_ss_list_131f_2061 NULL #define pci_ss_list_131f_2062 NULL #endif +#define pci_ss_list_1331_8200 NULL +#define pci_ss_list_1331_8201 NULL +#define pci_ss_list_1331_8202 NULL +#define pci_ss_list_1331_8210 NULL #define pci_ss_list_1332_5415 NULL #define pci_ss_list_1332_5425 NULL #define pci_ss_list_134a_0001 NULL #define pci_ss_list_134a_0002 NULL -#define pci_ss_list_134d_7890 NULL #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_134d_7890[] = { + &pci_ss_info_134d_7890_134d_0001, + NULL +}; static const pciSubsystemInfo *pci_ss_list_134d_7891[] = { &pci_ss_info_134d_7891_134d_0001, NULL @@ -29714,6 +30700,7 @@ static const pciSubsystemInfo *pci_ss_list_134d_7891[] = { #define pci_ss_list_135e_7402 NULL #define pci_ss_list_135e_7801 NULL #define pci_ss_list_135e_8001 NULL +#define pci_ss_list_136b_ff01 NULL #define pci_ss_list_1385_4100 NULL #define pci_ss_list_1385_4105 NULL #define pci_ss_list_1385_620a NULL @@ -29752,6 +30739,9 @@ static const pciSubsystemInfo *pci_ss_list_1397_2bd0[] = { #define pci_ss_list_13a3_0018 NULL #define pci_ss_list_13a8_0158 NULL #define pci_ss_list_13c0_0010 NULL +#define pci_ss_list_13c0_0020 NULL +#define pci_ss_list_13c0_0030 NULL +#define pci_ss_list_13c0_0210 NULL #define pci_ss_list_13c1_1000 NULL #define pci_ss_list_13c1_1001 NULL #define pci_ss_list_13c1_1002 NULL @@ -29777,6 +30767,7 @@ static const pciSubsystemInfo *pci_ss_list_13f6_0101[] = { }; static const pciSubsystemInfo *pci_ss_list_13f6_0111[] = { &pci_ss_info_13f6_0111_1019_0970, + &pci_ss_info_13f6_0111_1043_8035, &pci_ss_info_13f6_0111_1043_8077, &pci_ss_info_13f6_0111_1043_80e2, &pci_ss_info_13f6_0111_13f6_0111, @@ -29819,6 +30810,8 @@ static const pciSubsystemInfo *pci_ss_list_1415_9511[] = { }; #define pci_ss_list_1415_9521 NULL #endif +#define pci_ss_list_1420_8002 NULL +#define pci_ss_list_1420_8003 NULL #define pci_ss_list_144a_7296 NULL #define pci_ss_list_144a_7432 NULL #define pci_ss_list_144a_7433 NULL @@ -29992,7 +30985,10 @@ static const pciSubsystemInfo *pci_ss_list_14e4_16c7[] = { #define pci_ss_list_14e4_4211 NULL #define pci_ss_list_14e4_4212 NULL #define pci_ss_list_14e4_4301 NULL -#define pci_ss_list_14e4_4320 NULL +static const pciSubsystemInfo *pci_ss_list_14e4_4320[] = { + &pci_ss_info_14e4_4320_1737_4320, + NULL +}; static const pciSubsystemInfo *pci_ss_list_14e4_4401[] = { &pci_ss_info_14e4_4401_1043_80a8, NULL @@ -30166,6 +31162,8 @@ static const pciSubsystemInfo *pci_ss_list_14f1_2f00[] = { }; #define pci_ss_list_14f1_8234 NULL #endif +#define pci_ss_list_14fc_0000 NULL +#define pci_ss_list_14fc_0001 NULL #define pci_ss_list_1507_0001 NULL #define pci_ss_list_1507_0002 NULL #define pci_ss_list_1507_0003 NULL @@ -30291,10 +31289,16 @@ static const pciSubsystemInfo *pci_ss_list_1813_4100[] = { #define pci_ss_list_2348_2010 NULL #define pci_ss_list_3388_0013 NULL #define pci_ss_list_3388_0014 NULL -#define pci_ss_list_3388_0021 NULL +#define pci_ss_list_3388_0020 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_3388_0021[] = { + &pci_ss_info_3388_0021_4c53_1050, + &pci_ss_info_3388_0021_4c53_1080, + &pci_ss_info_3388_0021_4c53_3010, + NULL +}; #define pci_ss_list_3388_101a NULL #define pci_ss_list_3388_101b NULL -#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_3388_8011[] = { &pci_ss_info_3388_8011_3388_8011, NULL @@ -31696,6 +32700,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = { &pci_ss_info_0e11_b112, &pci_ss_info_0e11_b113, &pci_ss_info_0e11_b114, + &pci_ss_info_0e11_b121, &pci_ss_info_0e11_b123, &pci_ss_info_0e11_b126, &pci_ss_info_0e11_b134, @@ -31703,6 +32708,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = { &pci_ss_info_0e11_b144, &pci_ss_info_0e11_b14d, &pci_ss_info_0e11_b15a, + &pci_ss_info_0e11_b160, &pci_ss_info_0e11_b163, &pci_ss_info_0e11_b164, &pci_ss_info_0e11_b16e, @@ -31884,6 +32890,7 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = { &pci_ss_info_1014_0209, &pci_ss_info_1014_020e, &pci_ss_info_1014_0217, + &pci_ss_info_1014_021a, &pci_ss_info_1014_021d, &pci_ss_info_1014_0220, &pci_ss_info_1014_0222, @@ -31896,10 +32903,14 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = { &pci_ss_info_1014_023a, &pci_ss_info_1014_023b, &pci_ss_info_1014_023d, + &pci_ss_info_1014_0241, &pci_ss_info_1014_0244, &pci_ss_info_1014_0245, + &pci_ss_info_1014_0251, + &pci_ss_info_1014_0252, &pci_ss_info_1014_0258, &pci_ss_info_1014_0259, + &pci_ss_info_1014_0264, &pci_ss_info_1014_0265, &pci_ss_info_1014_0267, &pci_ss_info_1014_026a, @@ -32025,7 +33036,10 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_0098, &pci_ss_info_1028_0099, &pci_ss_info_1028_009b, + &pci_ss_info_1028_00aa, + &pci_ss_info_1028_00b1, &pci_ss_info_1028_00c5, + &pci_ss_info_1028_00ce, &pci_ss_info_1028_00d0, &pci_ss_info_1028_00d1, &pci_ss_info_1028_00d9, @@ -32185,6 +33199,7 @@ static const pciSubsystemInfo *pci_ss_list_1033[] = { &pci_ss_info_1033_806a, &pci_ss_info_1033_8077, &pci_ss_info_1033_809d, + &pci_ss_info_1033_80a8, &pci_ss_info_1033_80ac, &pci_ss_info_1033_80bc, NULL @@ -32283,6 +33298,7 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_8027, &pci_ss_info_1043_802c, &pci_ss_info_1043_8033, + &pci_ss_info_1043_8035, &pci_ss_info_1043_803e, &pci_ss_info_1043_8040, &pci_ss_info_1043_8042, @@ -32290,6 +33306,7 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_8052, &pci_ss_info_1043_8053, &pci_ss_info_1043_8064, + &pci_ss_info_1043_806f, &pci_ss_info_1043_8077, &pci_ss_info_1043_807f, &pci_ss_info_1043_808c, @@ -32533,6 +33550,7 @@ static const pciSubsystemInfo *pci_ss_list_107b[] = { static const pciSubsystemInfo *pci_ss_list_107d[] = { &pci_ss_info_107d_2633, &pci_ss_info_107d_2720, + &pci_ss_info_107d_2822, &pci_ss_info_107d_2840, &pci_ss_info_107d_2896, &pci_ss_info_107d_5330, @@ -32752,6 +33770,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5[] = { &pci_ss_info_10b5_2036, &pci_ss_info_10b5_2273, &pci_ss_info_10b5_2455, + &pci_ss_info_10b5_2696, &pci_ss_info_10b5_9050, &pci_ss_info_10b5_9080, NULL @@ -32915,7 +33934,6 @@ static const pciSubsystemInfo *pci_ss_list_10cf[] = { NULL }; #endif -#define pci_ss_list_10d0 NULL #define pci_ss_list_10d1 NULL #define pci_ss_list_10d2 NULL #define pci_ss_list_10d3 NULL @@ -33088,6 +34106,7 @@ static const pciSubsystemInfo *pci_ss_list_1109[] = { static const pciSubsystemInfo *pci_ss_list_110a[] = { &pci_ss_info_110a_0018, &pci_ss_info_110a_001e, + &pci_ss_info_110a_0021, &pci_ss_info_110a_0032, &pci_ss_info_110a_8005, NULL @@ -33181,14 +34200,18 @@ static const pciSubsystemInfo *pci_ss_list_1127[] = { #define pci_ss_list_1132 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1133[] = { - &pci_ss_info_1133_e001, - &pci_ss_info_1133_e002, - &pci_ss_info_1133_e003, - &pci_ss_info_1133_e004, - &pci_ss_info_1133_e005, - &pci_ss_info_1133_e010, - &pci_ss_info_1133_e012, - &pci_ss_info_1133_e014, + &pci_ss_info_1133_1c01, + &pci_ss_info_1133_1c02, + &pci_ss_info_1133_1c03, + &pci_ss_info_1133_1c04, + &pci_ss_info_1133_1c05, + &pci_ss_info_1133_1c06, + &pci_ss_info_1133_1c07, + &pci_ss_info_1133_1c08, + &pci_ss_info_1133_1c09, + &pci_ss_info_1133_1c0a, + &pci_ss_info_1133_1c0b, + &pci_ss_info_1133_1c0c, NULL }; #endif @@ -33884,7 +34907,13 @@ static const pciSubsystemInfo *pci_ss_list_1282[] = { #define pci_ss_list_1294 NULL #define pci_ss_list_1295 NULL #define pci_ss_list_1296 NULL -#define pci_ss_list_1297 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1297[] = { + &pci_ss_info_1297_c160, + &pci_ss_info_1297_f641, + NULL +}; +#endif #define pci_ss_list_1298 NULL #define pci_ss_list_1299 NULL #define pci_ss_list_129a NULL @@ -34218,6 +35247,7 @@ static const pciSubsystemInfo *pci_ss_list_1385[] = { &pci_ss_info_1385_1100, &pci_ss_info_1385_2100, &pci_ss_info_1385_f004, + &pci_ss_info_1385_f311, NULL }; #endif @@ -34717,6 +35747,7 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_8808, &pci_ss_info_1462_8817, &pci_ss_info_1462_8831, + &pci_ss_info_1462_8880, NULL }; #endif @@ -35462,6 +36493,7 @@ static const pciSubsystemInfo *pci_ss_list_172a[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1737[] = { &pci_ss_info_1737_3874, + &pci_ss_info_1737_4320, NULL }; #endif @@ -35618,7 +36650,23 @@ static const pciSubsystemInfo *pci_ss_list_4a14[] = { #endif #define pci_ss_list_4b10 NULL #define pci_ss_list_4c48 NULL -#define pci_ss_list_4c53 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_4c53[] = { + &pci_ss_info_4c53_1000, + &pci_ss_info_4c53_1010, + &pci_ss_info_4c53_1020, + &pci_ss_info_4c53_1030, + &pci_ss_info_4c53_1040, + &pci_ss_info_4c53_1050, + &pci_ss_info_4c53_1051, + &pci_ss_info_4c53_1060, + &pci_ss_info_4c53_1080, + &pci_ss_info_4c53_1300, + &pci_ss_info_4c53_1310, + &pci_ss_info_4c53_3010, + NULL +}; +#endif #define pci_ss_list_4ca1 NULL #define pci_ss_list_4d51 NULL #define pci_ss_list_4d54 NULL @@ -35634,7 +36682,12 @@ static const pciSubsystemInfo *pci_ss_list_5053[] = { #define pci_ss_list_5136 NULL #define pci_ss_list_5143 NULL #define pci_ss_list_5145 NULL -#define pci_ss_list_5168 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_5168[] = { + &pci_ss_info_5168_0138, + NULL +}; +#endif #define pci_ss_list_5301 NULL static const pciSubsystemInfo *pci_ss_list_5333[] = { &pci_ss_info_5333_8100, @@ -36980,6 +38033,15 @@ static const pciDeviceInfo pci_dev_info_1002_4158 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_4164 = { + 0x4164, pci_device_1002_4164, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_4164, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_4242 = { 0x4242, pci_device_1002_4242, #ifdef INIT_SUBSYS_INFO @@ -37448,6 +38510,15 @@ static const pciDeviceInfo pci_dev_info_1002_4c67 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_4c6e = { + 0x4c6e, pci_device_1002_4c6e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_4c6e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_4d46 = { 0x4d46, pci_device_1002_4d46, #ifdef INIT_SUBSYS_INFO @@ -38168,6 +39239,15 @@ static const pciDeviceInfo pci_dev_info_1002_5656 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_5961 = { + 0x5961, pci_device_1002_5961, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_5961, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_700f = { 0x700f, pci_device_1002_700f, #ifdef INIT_SUBSYS_INFO @@ -38186,6 +39266,15 @@ static const pciDeviceInfo pci_dev_info_1002_7010 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_cab0 = { + 0xcab0, pci_device_1002_cab0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_cab0, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_cab2 = { 0xcab2, pci_device_1002_cab2, #ifdef INIT_SUBSYS_INFO @@ -38532,6 +39621,60 @@ static const pciDeviceInfo pci_dev_info_100b_0022 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_100b_0028 = { + 0x0028, pci_device_100b_0028, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_0028, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_100b_002b = { + 0x002b, pci_device_100b_002b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_002b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_100b_002d = { + 0x002d, pci_device_100b_002d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_002d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_100b_002e = { + 0x002e, pci_device_100b_002e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_002e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_100b_002f = { + 0x002f, pci_device_100b_002f, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_002f, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_100b_0030 = { + 0x0030, pci_device_100b_0030, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_100b_0030, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_100b_0500 = { 0x0500, pci_device_100b_0500, #ifdef INIT_SUBSYS_INFO @@ -39280,6 +40423,15 @@ static const pciDeviceInfo pci_dev_info_1014_002e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_0031 = { + 0x0031, pci_device_1014_0031, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0031, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0036 = { 0x0036, pci_device_1014_0036, #ifdef INIT_SUBSYS_INFO @@ -39298,6 +40450,15 @@ static const pciDeviceInfo pci_dev_info_1014_003a = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_003c = { + 0x003c, pci_device_1014_003c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_003c, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_003e = { 0x003e, pci_device_1014_003e, #ifdef INIT_SUBSYS_INFO @@ -39388,6 +40549,15 @@ static const pciDeviceInfo pci_dev_info_1014_0053 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_0054 = { + 0x0054, pci_device_1014_0054, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0054, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0057 = { 0x0057, pci_device_1014_0057, #ifdef INIT_SUBSYS_INFO @@ -39406,6 +40576,15 @@ static const pciDeviceInfo pci_dev_info_1014_005c = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_005e = { + 0x005e, pci_device_1014_005e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_005e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_007c = { 0x007c, pci_device_1014_007c, #ifdef INIT_SUBSYS_INFO @@ -39424,6 +40603,15 @@ static const pciDeviceInfo pci_dev_info_1014_007d = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_008e = { + 0x008e, pci_device_1014_008e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_008e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0090 = { 0x0090, pci_device_1014_0090, #ifdef INIT_SUBSYS_INFO @@ -39433,6 +40621,15 @@ static const pciDeviceInfo pci_dev_info_1014_0090 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_0091 = { + 0x0091, pci_device_1014_0091, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0091, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0095 = { 0x0095, pci_device_1014_0095, #ifdef INIT_SUBSYS_INFO @@ -39451,6 +40648,15 @@ static const pciDeviceInfo pci_dev_info_1014_0096 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_009f = { + 0x009f, pci_device_1014_009f, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_009f, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_00a5 = { 0x00a5, pci_device_1014_00a5, #ifdef INIT_SUBSYS_INFO @@ -39478,6 +40684,15 @@ static const pciDeviceInfo pci_dev_info_1014_00b7 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_00b8 = { + 0x00b8, pci_device_1014_00b8, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_00b8, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_00be = { 0x00be, pci_device_1014_00be, #ifdef INIT_SUBSYS_INFO @@ -39505,6 +40720,15 @@ static const pciDeviceInfo pci_dev_info_1014_00fc = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_0104 = { + 0x0104, pci_device_1014_0104, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0104, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0105 = { 0x0105, pci_device_1014_0105, #ifdef INIT_SUBSYS_INFO @@ -39550,6 +40774,60 @@ static const pciDeviceInfo pci_dev_info_1014_0156 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_015e = { + 0x015e, pci_device_1014_015e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_015e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0160 = { + 0x0160, pci_device_1014_0160, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0160, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_016e = { + 0x016e, pci_device_1014_016e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_016e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0170 = { + 0x0170, pci_device_1014_0170, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0170, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_017d = { + 0x017d, pci_device_1014_017d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_017d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0180 = { + 0x0180, pci_device_1014_0180, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0180, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_01a7 = { 0x01a7, pci_device_1014_01a7, #ifdef INIT_SUBSYS_INFO @@ -39568,6 +40846,96 @@ static const pciDeviceInfo pci_dev_info_1014_01bd = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_01c1 = { + 0x01c1, pci_device_1014_01c1, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_01c1, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_01e6 = { + 0x01e6, pci_device_1014_01e6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_01e6, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_01ff = { + 0x01ff, pci_device_1014_01ff, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_01ff, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0219 = { + 0x0219, pci_device_1014_0219, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0219, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_021b = { + 0x021b, pci_device_1014_021b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_021b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_021c = { + 0x021c, pci_device_1014_021c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_021c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0233 = { + 0x0233, pci_device_1014_0233, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0233, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0266 = { + 0x0266, pci_device_1014_0266, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0266, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0268 = { + 0x0268, pci_device_1014_0268, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0268, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1014_0269 = { + 0x0269, pci_device_1014_0269, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0269, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_0302 = { 0x0302, pci_device_1014_0302, #ifdef INIT_SUBSYS_INFO @@ -39847,6 +41215,15 @@ static const pciDeviceInfo pci_dev_info_1022_2001 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1022_2003 = { + 0x2003, pci_device_1022_2003, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_2003, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1022_2020 = { 0x2020, pci_device_1022_2020, #ifdef INIT_SUBSYS_INFO @@ -40225,6 +41602,15 @@ static const pciDeviceInfo pci_dev_info_1022_746e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1022_756b = { + 0x756b, pci_device_1022_756b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_756b, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1023_0194 = { 0x0194, pci_device_1023_0194, #ifdef INIT_SUBSYS_INFO @@ -41545,6 +42931,15 @@ static const pciDeviceInfo pci_dev_info_1031_6057 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1033_0000 = { + 0x0000, pci_device_1033_0000, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1033_0000, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1033_0001 = { 0x0001, pci_device_1033_0001, #ifdef INIT_SUBSYS_INFO @@ -41788,6 +43183,15 @@ static const pciDeviceInfo pci_dev_info_1033_00cd = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1033_00df = { + 0x00df, pci_device_1033_00df, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1033_00df, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1033_00e0 = { 0x00e0, pci_device_1033_00e0, #ifdef INIT_SUBSYS_INFO @@ -41797,6 +43201,15 @@ static const pciDeviceInfo pci_dev_info_1033_00e0 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1033_00f3 = { + 0x00f3, pci_device_1033_00f3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1033_00f3, +#else + NULL, +#endif + 0 +}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1036_0000 = { 0x0000, pci_device_1036_0000, @@ -42114,6 +43527,15 @@ static const pciDeviceInfo pci_dev_info_1039_0745 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1039_0746 = { + 0x0746, pci_device_1039_0746, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1039_0746, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1039_0755 = { 0x0755, pci_device_1039_0755, #ifdef INIT_SUBSYS_INFO @@ -42411,6 +43833,15 @@ static const pciDeviceInfo pci_dev_info_1039_7018 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1039_7019 = { + 0x7019, pci_device_1039_7019, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1039_7019, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_103c_1005 = { 0x1005, pci_device_103c_1005, #ifdef INIT_SUBSYS_INFO @@ -42738,6 +44169,15 @@ static const pciDeviceInfo pci_dev_info_1043_4021 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1043_4057 = { + 0x4057, pci_device_1043_4057, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1043_4057, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1044_1012 = { @@ -43042,6 +44482,24 @@ static const pciDeviceInfo pci_dev_info_104a_0010 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104a_0209 = { + 0x0209, pci_device_104a_0209, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_0209, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_104a_020a = { + 0x020a, pci_device_104a_020a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_020a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_104a_0210 = { 0x0210, pci_device_104a_0210, #ifdef INIT_SUBSYS_INFO @@ -43051,6 +44509,42 @@ static const pciDeviceInfo pci_dev_info_104a_0210 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104a_021a = { + 0x021a, pci_device_104a_021a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_021a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_104a_021b = { + 0x021b, pci_device_104a_021b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_021b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_104a_0500 = { + 0x0500, pci_device_104a_0500, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_0500, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_104a_0564 = { + 0x0564, pci_device_104a_0564, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_0564, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_104a_0981 = { 0x0981, pci_device_104a_0981, #ifdef INIT_SUBSYS_INFO @@ -43087,6 +44581,15 @@ static const pciDeviceInfo pci_dev_info_104a_3520 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104a_55cc = { + 0x55cc, pci_device_104a_55cc, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104a_55cc, +#else + NULL, +#endif + 0 +}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_104b_0140 = { 0x0140, pci_device_104b_0140, @@ -43269,6 +44772,15 @@ static const pciDeviceInfo pci_dev_info_104c_8027 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104c_8029 = { + 0x8029, pci_device_104c_8029, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104c_8029, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_104c_8400 = { 0x8400, pci_device_104c_8400, #ifdef INIT_SUBSYS_INFO @@ -43278,6 +44790,24 @@ static const pciDeviceInfo pci_dev_info_104c_8400 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104c_8401 = { + 0x8401, pci_device_104c_8401, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104c_8401, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_104c_9000 = { + 0x9000, pci_device_104c_9000, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104c_9000, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_104c_a001 = { 0xa001, pci_device_104c_a001, #ifdef INIT_SUBSYS_INFO @@ -43530,6 +45060,15 @@ static const pciDeviceInfo pci_dev_info_104c_ac42 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_104c_ac44 = { + 0xac44, pci_device_104c_ac44, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_104c_ac44, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_104c_ac50 = { 0xac50, pci_device_104c_ac50, #ifdef INIT_SUBSYS_INFO @@ -43985,6 +45524,15 @@ static const pciDeviceInfo pci_dev_info_105a_1275 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_105a_3318 = { + 0x3318, pci_device_105a_3318, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_105a_3318, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_105a_3376 = { 0x3376, pci_device_105a_3376, #ifdef INIT_SUBSYS_INFO @@ -44084,6 +45632,15 @@ static const pciDeviceInfo pci_dev_info_105a_6621 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_105a_6629 = { + 0x6629, pci_device_105a_6629, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_105a_6629, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_105a_7275 = { 0x7275, pci_device_105a_7275, #ifdef INIT_SUBSYS_INFO @@ -44463,6 +46020,15 @@ static const pciDeviceInfo pci_dev_info_1069_0050 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1069_b166 = { + 0xb166, pci_device_1069_b166, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1069_b166, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1069_ba55 = { 0xba55, pci_device_1069_ba55, #ifdef INIT_SUBSYS_INFO @@ -45978,6 +47544,24 @@ static const pciDeviceInfo pci_dev_info_1093_1350 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1093_17d0 = { + 0x17d0, pci_device_1093_17d0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1093_17d0, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1093_2410 = { + 0x2410, pci_device_1093_2410, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1093_2410, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1093_2a60 = { 0x2a60, pci_device_1093_2a60, #ifdef INIT_SUBSYS_INFO @@ -46880,6 +48464,15 @@ static const pciDeviceInfo pci_dev_info_10b5_9080 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10b5_bb04 = { + 0xbb04, pci_device_10b5_bb04, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10b5_bb04, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_10b6_0001 = { @@ -47028,6 +48621,15 @@ static const pciDeviceInfo pci_dev_info_10b7_1007 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10b7_1700 = { + 0x1700, pci_device_10b7_1700, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10b7_1700, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10b7_3390 = { 0x3390, pci_device_10b7_3390, #ifdef INIT_SUBSYS_INFO @@ -47226,6 +48828,15 @@ static const pciDeviceInfo pci_dev_info_10b7_7646 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10b7_7770 = { + 0x7770, pci_device_10b7_7770, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10b7_7770, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10b7_7940 = { 0x7940, pci_device_10b7_7940, #ifdef INIT_SUBSYS_INFO @@ -48237,6 +49848,26 @@ static const pciDeviceInfo pci_dev_info_10c8_8016 = { 0 }; #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_10cc_0660 = { + 0x0660, pci_device_10cc_0660, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10cc_0660, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10cc_0661 = { + 0x0661, pci_device_10cc_0661, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10cc_0661, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_10cd_1100 = { 0x1100, pci_device_10cd_1100, #ifdef INIT_SUBSYS_INFO @@ -48579,6 +50210,24 @@ static const pciDeviceInfo pci_dev_info_10de_006b = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_006c = { + 0x006c, pci_device_10de_006c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_006c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_006d = { + 0x006d, pci_device_10de_006d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_006d, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_006e = { 0x006e, pci_device_10de_006e, #ifdef INIT_SUBSYS_INFO @@ -48597,6 +50246,96 @@ static const pciDeviceInfo pci_dev_info_10de_00a0 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_00d0 = { + 0x00d0, pci_device_10de_00d0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d0, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d1 = { + 0x00d1, pci_device_10de_00d1, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d1, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d2 = { + 0x00d2, pci_device_10de_00d2, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d2, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d4 = { + 0x00d4, pci_device_10de_00d4, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d4, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d5 = { + 0x00d5, pci_device_10de_00d5, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d5, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d6 = { + 0x00d6, pci_device_10de_00d6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d6, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d7 = { + 0x00d7, pci_device_10de_00d7, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d7, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00d8 = { + 0x00d8, pci_device_10de_00d8, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00d8, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00da = { + 0x00da, pci_device_10de_00da, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00da, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_00dd = { + 0x00dd, pci_device_10de_00dd, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_00dd, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0100 = { 0x0100, pci_device_10de_0100, #ifdef INIT_SUBSYS_INFO @@ -48984,6 +50723,15 @@ static const pciDeviceInfo pci_dev_info_10de_01c3 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_01e0 = { + 0x01e0, pci_device_10de_01e0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01e0, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_01e8 = { 0x01e8, pci_device_10de_01e8, #ifdef INIT_SUBSYS_INFO @@ -48993,6 +50741,60 @@ static const pciDeviceInfo pci_dev_info_10de_01e8 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_01ea = { + 0x01ea, pci_device_10de_01ea, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01ea, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01eb = { + 0x01eb, pci_device_10de_01eb, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01eb, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01ec = { + 0x01ec, pci_device_10de_01ec, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01ec, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01ed = { + 0x01ed, pci_device_10de_01ed, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01ed, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01ee = { + 0x01ee, pci_device_10de_01ee, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01ee, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01ef = { + 0x01ef, pci_device_10de_01ef, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01ef, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_01f0 = { 0x01f0, pci_device_10de_01f0, #ifdef INIT_SUBSYS_INFO @@ -49128,6 +50930,15 @@ static const pciDeviceInfo pci_dev_info_10de_0282 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0286 = { + 0x0286, pci_device_10de_0286, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0286, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0288 = { 0x0288, pci_device_10de_0288, #ifdef INIT_SUBSYS_INFO @@ -49191,6 +51002,231 @@ static const pciDeviceInfo pci_dev_info_10de_0309 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0311 = { + 0x0311, pci_device_10de_0311, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0311, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0312 = { + 0x0312, pci_device_10de_0312, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0312, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0314 = { + 0x0314, pci_device_10de_0314, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0314, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_031a = { + 0x031a, pci_device_10de_031a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_031a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_031b = { + 0x031b, pci_device_10de_031b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_031b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_031c = { + 0x031c, pci_device_10de_031c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_031c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0321 = { + 0x0321, pci_device_10de_0321, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0321, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0322 = { + 0x0322, pci_device_10de_0322, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0322, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0323 = { + 0x0323, pci_device_10de_0323, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0323, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0324 = { + 0x0324, pci_device_10de_0324, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0324, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0325 = { + 0x0325, pci_device_10de_0325, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0325, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0328 = { + 0x0328, pci_device_10de_0328, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0328, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0329 = { + 0x0329, pci_device_10de_0329, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0329, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_032a = { + 0x032a, pci_device_10de_032a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_032a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_032b = { + 0x032b, pci_device_10de_032b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_032b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_032c = { + 0x032c, pci_device_10de_032c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_032c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_032d = { + 0x032d, pci_device_10de_032d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_032d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0330 = { + 0x0330, pci_device_10de_0330, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0330, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0331 = { + 0x0331, pci_device_10de_0331, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0331, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0332 = { + 0x0332, pci_device_10de_0332, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0332, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0333 = { + 0x0333, pci_device_10de_0333, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0333, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0338 = { + 0x0338, pci_device_10de_0338, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0338, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0341 = { + 0x0341, pci_device_10de_0341, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0341, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0342 = { + 0x0342, pci_device_10de_0342, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0342, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_034e = { + 0x034e, pci_device_10de_034e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_034e, +#else + NULL, +#endif + 0 +}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_10df_1ae5 = { 0x1ae5, pci_device_10df_1ae5, @@ -49513,6 +51549,15 @@ static const pciDeviceInfo pci_dev_info_10e8_82db = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10e8_8851 = { + 0x8851, pci_device_10e8_8851, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10e8_8851, +#else + NULL, +#endif + 0 +}; #endif static const pciDeviceInfo pci_dev_info_10ea_1680 = { 0x1680, pci_device_10ea_1680, @@ -49728,6 +51773,15 @@ static const pciDeviceInfo pci_dev_info_10ee_3fc5 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10ee_8381 = { + 0x8381, pci_device_10ee_8381, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ee_8381, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_10ef_8154 = { @@ -50738,6 +52792,15 @@ static const pciDeviceInfo pci_dev_info_1106_b168 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_b198 = { + 0xb198, pci_device_1106_b198, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_b198, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1107_0576 = { @@ -50917,6 +52980,15 @@ static const pciDeviceInfo pci_dev_info_110a_2102 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_110a_4021 = { + 0x4021, pci_device_110a_4021, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_110a_4021, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_110a_4942 = { 0x4942, pci_device_110a_4942, #ifdef INIT_SUBSYS_INFO @@ -52180,6 +54252,51 @@ static const pciDeviceInfo pci_dev_info_1133_e005 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e006 = { + 0xe006, pci_device_1133_e006, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e006, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e007 = { + 0xe007, pci_device_1133_e007, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e007, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e008 = { + 0xe008, pci_device_1133_e008, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e008, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e009 = { + 0xe009, pci_device_1133_e009, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e009, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e00a = { + 0xe00a, pci_device_1133_e00a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e00a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1133_e00b = { 0xe00b, pci_device_1133_e00b, #ifdef INIT_SUBSYS_INFO @@ -52189,6 +54306,33 @@ static const pciDeviceInfo pci_dev_info_1133_e00b = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e00c = { + 0xe00c, pci_device_1133_e00c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e00c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e00d = { + 0xe00d, pci_device_1133_e00d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e00d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e00e = { + 0xe00e, pci_device_1133_e00e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e00e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1133_e010 = { 0xe010, pci_device_1133_e010, #ifdef INIT_SUBSYS_INFO @@ -52198,6 +54342,15 @@ static const pciDeviceInfo pci_dev_info_1133_e010 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e011 = { + 0xe011, pci_device_1133_e011, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e011, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1133_e012 = { 0xe012, pci_device_1133_e012, #ifdef INIT_SUBSYS_INFO @@ -52207,6 +54360,15 @@ static const pciDeviceInfo pci_dev_info_1133_e012 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e013 = { + 0xe013, pci_device_1133_e013, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e013, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1133_e014 = { 0xe014, pci_device_1133_e014, #ifdef INIT_SUBSYS_INFO @@ -52216,6 +54378,33 @@ static const pciDeviceInfo pci_dev_info_1133_e014 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e015 = { + 0xe015, pci_device_1133_e015, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e015, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e016 = { + 0xe016, pci_device_1133_e016, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e016, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e017 = { + 0xe017, pci_device_1133_e017, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e017, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1133_e018 = { 0xe018, pci_device_1133_e018, #ifdef INIT_SUBSYS_INFO @@ -52225,6 +54414,60 @@ static const pciDeviceInfo pci_dev_info_1133_e018 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e019 = { + 0xe019, pci_device_1133_e019, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e019, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e01a = { + 0xe01a, pci_device_1133_e01a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e01a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e01b = { + 0xe01b, pci_device_1133_e01b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e01b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e01c = { + 0xe01c, pci_device_1133_e01c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e01c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e01e = { + 0xe01e, pci_device_1133_e01e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e01e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1133_e020 = { + 0xe020, pci_device_1133_e020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e020, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1134_0001 = { @@ -55326,6 +57569,24 @@ static const pciDeviceInfo pci_dev_info_1242_4643 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1242_6562 = { + 0x6562, pci_device_1242_6562, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1242_6562, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1242_656a = { + 0x656a, pci_device_1242_656a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1242_656a, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1244_0700 = { @@ -56609,6 +58870,17 @@ static const pciDeviceInfo pci_dev_info_12d9_0004 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_12de_0200 = { + 0x0200, pci_device_12de_0200, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12de_0200, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_12e0_0010 = { 0x0010, pci_device_12e0_0010, #ifdef INIT_SUBSYS_INFO @@ -57437,6 +59709,44 @@ static const pciDeviceInfo pci_dev_info_131f_2062 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1331_8200 = { + 0x8200, pci_device_1331_8200, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1331_8200, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1331_8201 = { + 0x8201, pci_device_1331_8201, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1331_8201, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1331_8202 = { + 0x8202, pci_device_1331_8202, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1331_8202, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1331_8210 = { + 0x8210, pci_device_1331_8210, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1331_8210, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1332_5415 = { 0x5415, pci_device_1332_5415, #ifdef INIT_SUBSYS_INFO @@ -57773,6 +60083,17 @@ static const pciDeviceInfo pci_dev_info_135e_8001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_136b_ff01 = { + 0xff01, pci_device_136b_ff01, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_136b_ff01, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1385_4100 = { 0x4100, pci_device_1385_4100, #ifdef INIT_SUBSYS_INFO @@ -58032,6 +60353,33 @@ static const pciDeviceInfo pci_dev_info_13c0_0010 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_13c0_0020 = { + 0x0020, pci_device_13c0_0020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13c0_0020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_13c0_0030 = { + 0x0030, pci_device_13c0_0030, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13c0_0030, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_13c0_0210 = { + 0x0210, pci_device_13c0_0210, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13c0_0210, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_13c1_1000 = { @@ -58393,6 +60741,26 @@ static const pciDeviceInfo pci_dev_info_1415_9521 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1420_8002 = { + 0x8002, pci_device_1420_8002, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1420_8002, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1420_8003 = { + 0x8003, pci_device_1420_8003, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1420_8003, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_144a_7296 = { 0x7296, pci_device_144a_7296, #ifdef INIT_SUBSYS_INFO @@ -59973,6 +62341,26 @@ static const pciDeviceInfo pci_dev_info_14f1_8234 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_14fc_0000 = { + 0x0000, pci_device_14fc_0000, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14fc_0000, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14fc_0001 = { + 0x0001, pci_device_14fc_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14fc_0001, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1507_0001 = { 0x0001, pci_device_1507_0001, #ifdef INIT_SUBSYS_INFO @@ -60909,6 +63297,15 @@ static const pciDeviceInfo pci_dev_info_3388_0014 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_3388_0020 = { + 0x0020, pci_device_3388_0020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_3388_0020, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_3388_0021 = { 0x0021, pci_device_3388_0021, #ifdef INIT_SUBSYS_INFO @@ -66348,6 +68745,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_4146, &pci_dev_info_1002_4147, &pci_dev_info_1002_4158, + &pci_dev_info_1002_4164, &pci_dev_info_1002_4242, &pci_dev_info_1002_4336, &pci_dev_info_1002_4337, @@ -66400,6 +68798,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_4c65, &pci_dev_info_1002_4c66, &pci_dev_info_1002_4c67, + &pci_dev_info_1002_4c6e, &pci_dev_info_1002_4d46, &pci_dev_info_1002_4d4c, &pci_dev_info_1002_4e44, @@ -66480,8 +68879,10 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_5654, &pci_dev_info_1002_5655, &pci_dev_info_1002_5656, + &pci_dev_info_1002_5961, &pci_dev_info_1002_700f, &pci_dev_info_1002_7010, + &pci_dev_info_1002_cab0, &pci_dev_info_1002_cab2, NULL }; @@ -66540,6 +68941,12 @@ static const pciDeviceInfo *pci_dev_list_100b[] = { &pci_dev_info_100b_0012, &pci_dev_info_100b_0020, &pci_dev_info_100b_0022, + &pci_dev_info_100b_0028, + &pci_dev_info_100b_002b, + &pci_dev_info_100b_002d, + &pci_dev_info_100b_002e, + &pci_dev_info_100b_002f, + &pci_dev_info_100b_0030, &pci_dev_info_100b_0500, &pci_dev_info_100b_0501, &pci_dev_info_100b_0502, @@ -66642,8 +69049,10 @@ static const pciDeviceInfo *pci_dev_list_1014[] = { &pci_dev_info_1014_0022, &pci_dev_info_1014_002d, &pci_dev_info_1014_002e, + &pci_dev_info_1014_0031, &pci_dev_info_1014_0036, &pci_dev_info_1014_003a, + &pci_dev_info_1014_003c, &pci_dev_info_1014_003e, &pci_dev_info_1014_0045, &pci_dev_info_1014_0046, @@ -66654,26 +69063,49 @@ static const pciDeviceInfo *pci_dev_list_1014[] = { &pci_dev_info_1014_004f, &pci_dev_info_1014_0050, &pci_dev_info_1014_0053, + &pci_dev_info_1014_0054, &pci_dev_info_1014_0057, &pci_dev_info_1014_005c, + &pci_dev_info_1014_005e, &pci_dev_info_1014_007c, &pci_dev_info_1014_007d, + &pci_dev_info_1014_008e, &pci_dev_info_1014_0090, + &pci_dev_info_1014_0091, &pci_dev_info_1014_0095, &pci_dev_info_1014_0096, + &pci_dev_info_1014_009f, &pci_dev_info_1014_00a5, &pci_dev_info_1014_00a6, &pci_dev_info_1014_00b7, + &pci_dev_info_1014_00b8, &pci_dev_info_1014_00be, &pci_dev_info_1014_00dc, &pci_dev_info_1014_00fc, + &pci_dev_info_1014_0104, &pci_dev_info_1014_0105, &pci_dev_info_1014_010f, &pci_dev_info_1014_0142, &pci_dev_info_1014_0144, &pci_dev_info_1014_0156, + &pci_dev_info_1014_015e, + &pci_dev_info_1014_0160, + &pci_dev_info_1014_016e, + &pci_dev_info_1014_0170, + &pci_dev_info_1014_017d, + &pci_dev_info_1014_0180, &pci_dev_info_1014_01a7, &pci_dev_info_1014_01bd, + &pci_dev_info_1014_01c1, + &pci_dev_info_1014_01e6, + &pci_dev_info_1014_01ff, + &pci_dev_info_1014_0219, + &pci_dev_info_1014_021b, + &pci_dev_info_1014_021c, + &pci_dev_info_1014_0233, + &pci_dev_info_1014_0266, + &pci_dev_info_1014_0268, + &pci_dev_info_1014_0269, &pci_dev_info_1014_0302, &pci_dev_info_1014_ffff, NULL @@ -66736,6 +69168,7 @@ static const pciDeviceInfo *pci_dev_list_1022[] = { &pci_dev_info_1022_1103, &pci_dev_info_1022_2000, &pci_dev_info_1022_2001, + &pci_dev_info_1022_2003, &pci_dev_info_1022_2020, &pci_dev_info_1022_2040, &pci_dev_info_1022_3000, @@ -66778,6 +69211,7 @@ static const pciDeviceInfo *pci_dev_list_1022[] = { &pci_dev_info_1022_746b, &pci_dev_info_1022_746d, &pci_dev_info_1022_746e, + &pci_dev_info_1022_756b, NULL }; static const pciDeviceInfo *pci_dev_list_1023[] = { @@ -66965,6 +69399,7 @@ static const pciDeviceInfo *pci_dev_list_1031[] = { }; #define pci_dev_list_1032 NULL static const pciDeviceInfo *pci_dev_list_1033[] = { + &pci_dev_info_1033_0000, &pci_dev_info_1033_0001, &pci_dev_info_1033_0002, &pci_dev_info_1033_0003, @@ -66992,7 +69427,9 @@ static const pciDeviceInfo *pci_dev_list_1033[] = { &pci_dev_info_1033_009b, &pci_dev_info_1033_00a6, &pci_dev_info_1033_00cd, + &pci_dev_info_1033_00df, &pci_dev_info_1033_00e0, + &pci_dev_info_1033_00f3, NULL }; #define pci_dev_list_1034 NULL @@ -67040,6 +69477,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = { &pci_dev_info_1039_0735, &pci_dev_info_1039_0740, &pci_dev_info_1039_0745, + &pci_dev_info_1039_0746, &pci_dev_info_1039_0755, &pci_dev_info_1039_0900, &pci_dev_info_1039_0961, @@ -67073,6 +69511,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = { &pci_dev_info_1039_7013, &pci_dev_info_1039_7016, &pci_dev_info_1039_7018, + &pci_dev_info_1039_7019, NULL }; #define pci_dev_list_103a NULL @@ -67127,6 +69566,7 @@ static const pciDeviceInfo *pci_dev_list_1042[] = { static const pciDeviceInfo *pci_dev_list_1043[] = { &pci_dev_info_1043_0675, &pci_dev_info_1043_4021, + &pci_dev_info_1043_4057, NULL }; #endif @@ -67182,11 +69622,18 @@ static const pciDeviceInfo *pci_dev_list_104a[] = { &pci_dev_info_104a_0008, &pci_dev_info_104a_0009, &pci_dev_info_104a_0010, + &pci_dev_info_104a_0209, + &pci_dev_info_104a_020a, &pci_dev_info_104a_0210, + &pci_dev_info_104a_021a, + &pci_dev_info_104a_021b, + &pci_dev_info_104a_0500, + &pci_dev_info_104a_0564, &pci_dev_info_104a_0981, &pci_dev_info_104a_1746, &pci_dev_info_104a_2774, &pci_dev_info_104a_3520, + &pci_dev_info_104a_55cc, NULL }; #ifdef VENDOR_INCLUDE_NONVIDEO @@ -67215,7 +69662,10 @@ static const pciDeviceInfo *pci_dev_list_104c[] = { &pci_dev_info_104c_8024, &pci_dev_info_104c_8026, &pci_dev_info_104c_8027, + &pci_dev_info_104c_8029, &pci_dev_info_104c_8400, + &pci_dev_info_104c_8401, + &pci_dev_info_104c_9000, &pci_dev_info_104c_a001, &pci_dev_info_104c_a100, &pci_dev_info_104c_a102, @@ -67244,6 +69694,7 @@ static const pciDeviceInfo *pci_dev_list_104c[] = { &pci_dev_info_104c_ac40, &pci_dev_info_104c_ac41, &pci_dev_info_104c_ac42, + &pci_dev_info_104c_ac44, &pci_dev_info_104c_ac50, &pci_dev_info_104c_ac51, &pci_dev_info_104c_ac52, @@ -67325,6 +69776,7 @@ static const pciDeviceInfo *pci_dev_list_105a[] = { &pci_dev_info_105a_0d30, &pci_dev_info_105a_0d38, &pci_dev_info_105a_1275, + &pci_dev_info_105a_3318, &pci_dev_info_105a_3376, &pci_dev_info_105a_4d30, &pci_dev_info_105a_4d33, @@ -67336,6 +69788,7 @@ static const pciDeviceInfo *pci_dev_list_105a[] = { &pci_dev_info_105a_6268, &pci_dev_info_105a_6269, &pci_dev_info_105a_6621, + &pci_dev_info_105a_6629, &pci_dev_info_105a_7275, NULL }; @@ -67414,6 +69867,7 @@ static const pciDeviceInfo *pci_dev_list_1069[] = { &pci_dev_info_1069_0002, &pci_dev_info_1069_0010, &pci_dev_info_1069_0050, + &pci_dev_info_1069_b166, &pci_dev_info_1069_ba55, &pci_dev_info_1069_ba56, NULL @@ -67686,6 +70140,8 @@ static const pciDeviceInfo *pci_dev_list_1093[] = { &pci_dev_info_1093_1190, &pci_dev_info_1093_1330, &pci_dev_info_1093_1350, + &pci_dev_info_1093_17d0, + &pci_dev_info_1093_2410, &pci_dev_info_1093_2a60, &pci_dev_info_1093_b001, &pci_dev_info_1093_b011, @@ -67860,6 +70316,7 @@ static const pciDeviceInfo *pci_dev_list_10b5[] = { &pci_dev_info_10b5_906d, &pci_dev_info_10b5_906e, &pci_dev_info_10b5_9080, + &pci_dev_info_10b5_bb04, NULL }; #endif @@ -67886,6 +70343,7 @@ static const pciDeviceInfo *pci_dev_list_10b7[] = { &pci_dev_info_10b7_0910, &pci_dev_info_10b7_1006, &pci_dev_info_10b7_1007, + &pci_dev_info_10b7_1700, &pci_dev_info_10b7_3390, &pci_dev_info_10b7_3590, &pci_dev_info_10b7_4500, @@ -67908,6 +70366,7 @@ static const pciDeviceInfo *pci_dev_list_10b7[] = { &pci_dev_info_10b7_6563, &pci_dev_info_10b7_6564, &pci_dev_info_10b7_7646, + &pci_dev_info_10b7_7770, &pci_dev_info_10b7_7940, &pci_dev_info_10b7_7980, &pci_dev_info_10b7_7990, @@ -68064,7 +70523,13 @@ static const pciDeviceInfo *pci_dev_list_10c8[] = { #define pci_dev_list_10c9 NULL #define pci_dev_list_10ca NULL #define pci_dev_list_10cb NULL -#define pci_dev_list_10cc NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_10cc[] = { + &pci_dev_info_10cc_0660, + &pci_dev_info_10cc_0661, + NULL +}; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_10cd[] = { &pci_dev_info_10cd_1100, @@ -68082,7 +70547,6 @@ static const pciDeviceInfo *pci_dev_list_10cf[] = { NULL }; #endif -#define pci_dev_list_10d0 NULL #define pci_dev_list_10d1 NULL #define pci_dev_list_10d2 NULL #define pci_dev_list_10d3 NULL @@ -68140,8 +70604,20 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0068, &pci_dev_info_10de_006a, &pci_dev_info_10de_006b, + &pci_dev_info_10de_006c, + &pci_dev_info_10de_006d, &pci_dev_info_10de_006e, &pci_dev_info_10de_00a0, + &pci_dev_info_10de_00d0, + &pci_dev_info_10de_00d1, + &pci_dev_info_10de_00d2, + &pci_dev_info_10de_00d4, + &pci_dev_info_10de_00d5, + &pci_dev_info_10de_00d6, + &pci_dev_info_10de_00d7, + &pci_dev_info_10de_00d8, + &pci_dev_info_10de_00da, + &pci_dev_info_10de_00dd, &pci_dev_info_10de_0100, &pci_dev_info_10de_0101, &pci_dev_info_10de_0103, @@ -68185,7 +70661,14 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_01c1, &pci_dev_info_10de_01c2, &pci_dev_info_10de_01c3, + &pci_dev_info_10de_01e0, &pci_dev_info_10de_01e8, + &pci_dev_info_10de_01ea, + &pci_dev_info_10de_01eb, + &pci_dev_info_10de_01ec, + &pci_dev_info_10de_01ed, + &pci_dev_info_10de_01ee, + &pci_dev_info_10de_01ef, &pci_dev_info_10de_01f0, &pci_dev_info_10de_0200, &pci_dev_info_10de_0201, @@ -68201,6 +70684,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0280, &pci_dev_info_10de_0281, &pci_dev_info_10de_0282, + &pci_dev_info_10de_0286, &pci_dev_info_10de_0288, &pci_dev_info_10de_0289, &pci_dev_info_10de_0300, @@ -68208,6 +70692,31 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0302, &pci_dev_info_10de_0308, &pci_dev_info_10de_0309, + &pci_dev_info_10de_0311, + &pci_dev_info_10de_0312, + &pci_dev_info_10de_0314, + &pci_dev_info_10de_031a, + &pci_dev_info_10de_031b, + &pci_dev_info_10de_031c, + &pci_dev_info_10de_0321, + &pci_dev_info_10de_0322, + &pci_dev_info_10de_0323, + &pci_dev_info_10de_0324, + &pci_dev_info_10de_0325, + &pci_dev_info_10de_0328, + &pci_dev_info_10de_0329, + &pci_dev_info_10de_032a, + &pci_dev_info_10de_032b, + &pci_dev_info_10de_032c, + &pci_dev_info_10de_032d, + &pci_dev_info_10de_0330, + &pci_dev_info_10de_0331, + &pci_dev_info_10de_0332, + &pci_dev_info_10de_0333, + &pci_dev_info_10de_0338, + &pci_dev_info_10de_0341, + &pci_dev_info_10de_0342, + &pci_dev_info_10de_034e, NULL }; #ifdef VENDOR_INCLUDE_NONVIDEO @@ -68270,6 +70779,7 @@ static const pciDeviceInfo *pci_dev_list_10e8[] = { &pci_dev_info_10e8_811a, &pci_dev_info_10e8_8170, &pci_dev_info_10e8_82db, + &pci_dev_info_10e8_8851, NULL }; #endif @@ -68317,6 +70827,7 @@ static const pciDeviceInfo *pci_dev_list_10ee[] = { &pci_dev_info_10ee_3fc3, &pci_dev_info_10ee_3fc4, &pci_dev_info_10ee_3fc5, + &pci_dev_info_10ee_8381, NULL }; #endif @@ -68491,6 +71002,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_b103, &pci_dev_info_1106_b112, &pci_dev_info_1106_b168, + &pci_dev_info_1106_b198, NULL }; #endif @@ -68530,6 +71042,7 @@ static const pciDeviceInfo *pci_dev_list_110a[] = { &pci_dev_info_110a_007c, &pci_dev_info_110a_007d, &pci_dev_info_110a_2102, + &pci_dev_info_110a_4021, &pci_dev_info_110a_4942, &pci_dev_info_110a_6120, NULL @@ -68767,11 +71280,30 @@ static const pciDeviceInfo *pci_dev_list_1133[] = { &pci_dev_info_1133_e003, &pci_dev_info_1133_e004, &pci_dev_info_1133_e005, + &pci_dev_info_1133_e006, + &pci_dev_info_1133_e007, + &pci_dev_info_1133_e008, + &pci_dev_info_1133_e009, + &pci_dev_info_1133_e00a, &pci_dev_info_1133_e00b, + &pci_dev_info_1133_e00c, + &pci_dev_info_1133_e00d, + &pci_dev_info_1133_e00e, &pci_dev_info_1133_e010, + &pci_dev_info_1133_e011, &pci_dev_info_1133_e012, + &pci_dev_info_1133_e013, &pci_dev_info_1133_e014, + &pci_dev_info_1133_e015, + &pci_dev_info_1133_e016, + &pci_dev_info_1133_e017, &pci_dev_info_1133_e018, + &pci_dev_info_1133_e019, + &pci_dev_info_1133_e01a, + &pci_dev_info_1133_e01b, + &pci_dev_info_1133_e01c, + &pci_dev_info_1133_e01e, + &pci_dev_info_1133_e020, NULL }; #endif @@ -69621,6 +72153,8 @@ static const pciDeviceInfo *pci_dev_list_123f[] = { static const pciDeviceInfo *pci_dev_list_1242[] = { &pci_dev_info_1242_1560, &pci_dev_info_1242_4643, + &pci_dev_info_1242_6562, + &pci_dev_info_1242_656a, NULL }; #endif @@ -70049,7 +72583,12 @@ static const pciDeviceInfo *pci_dev_list_12d9[] = { #define pci_dev_list_12db NULL #define pci_dev_list_12dc NULL #define pci_dev_list_12dd NULL -#define pci_dev_list_12de NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_12de[] = { + &pci_dev_info_12de_0200, + NULL +}; +#endif #define pci_dev_list_12df NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_12e0[] = { @@ -70251,7 +72790,15 @@ static const pciDeviceInfo *pci_dev_list_131f[] = { #define pci_dev_list_132c NULL #define pci_dev_list_132d NULL #define pci_dev_list_1330 NULL -#define pci_dev_list_1331 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1331[] = { + &pci_dev_info_1331_8200, + &pci_dev_info_1331_8201, + &pci_dev_info_1331_8202, + &pci_dev_info_1331_8210, + NULL +}; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1332[] = { &pci_dev_info_1332_5415, @@ -70361,7 +72908,12 @@ static const pciDeviceInfo *pci_dev_list_135e[] = { #define pci_dev_list_1368 NULL #define pci_dev_list_1369 NULL #define pci_dev_list_136a NULL -#define pci_dev_list_136b NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_136b[] = { + &pci_dev_info_136b_ff01, + NULL +}; +#endif #define pci_dev_list_136c NULL #define pci_dev_list_136d NULL #define pci_dev_list_136f NULL @@ -70505,6 +73057,9 @@ static const pciDeviceInfo *pci_dev_list_13a8[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_13c0[] = { &pci_dev_info_13c0_0010, + &pci_dev_info_13c0_0020, + &pci_dev_info_13c0_0030, + &pci_dev_info_13c0_0210, NULL }; #endif @@ -70691,7 +73246,13 @@ static const pciDeviceInfo *pci_dev_list_1415[] = { #define pci_dev_list_141d NULL #define pci_dev_list_141e NULL #define pci_dev_list_141f NULL -#define pci_dev_list_1420 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1420[] = { + &pci_dev_info_1420_8002, + &pci_dev_info_1420_8003, + NULL +}; +#endif #define pci_dev_list_1421 NULL #define pci_dev_list_1422 NULL #define pci_dev_list_1423 NULL @@ -71144,7 +73705,13 @@ static const pciDeviceInfo *pci_dev_list_14f1[] = { #define pci_dev_list_14f9 NULL #define pci_dev_list_14fa NULL #define pci_dev_list_14fb NULL -#define pci_dev_list_14fc NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_14fc[] = { + &pci_dev_info_14fc_0000, + &pci_dev_info_14fc_0001, + NULL +}; +#endif #define pci_dev_list_14fd NULL #define pci_dev_list_14fe NULL #define pci_dev_list_14ff NULL @@ -71706,6 +74273,7 @@ static const pciDeviceInfo *pci_dev_list_2348[] = { static const pciDeviceInfo *pci_dev_list_3388[] = { &pci_dev_info_3388_0013, &pci_dev_info_3388_0014, + &pci_dev_info_3388_0020, &pci_dev_info_3388_0021, &pci_dev_info_3388_101a, &pci_dev_info_3388_101b, @@ -73129,9 +75697,6 @@ static const pciVendorInfo pciVendorInfoList[] = { #ifdef VENDOR_INCLUDE_NONVIDEO {0x10cf, pci_vendor_10cf, pci_dev_list_10cf}, #endif -#ifdef VENDOR_INCLUDE_NONVIDEO - {0x10d0, pci_vendor_10d0, pci_dev_list_10d0}, -#endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x10d1, pci_vendor_10d1, pci_dev_list_10d1}, #endif @@ -78065,9 +80630,6 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { #ifdef VENDOR_INCLUDE_NONVIDEO {0x10cf, pci_vendor_10cf, pci_ss_list_10cf}, #endif -#ifdef VENDOR_INCLUDE_NONVIDEO - {0x10d0, pci_vendor_10d0, pci_ss_list_10d0}, -#endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x10d1, pci_vendor_10d1, pci_ss_list_10d1}, #endif diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 534c8973f..cf12c42cc 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.13 2003/08/24 17:37:10 dawes Exp $ */ /* * Display the Subsystem Vendor Id and Subsystem Id in order to identify * the cards installed in this computer diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c index 3bb14b0a9..ad090d43c 100644 --- a/hw/xfree86/shadowfb/sfbmodule.c +++ b/hw/xfree86/shadowfb/sfbmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.2 1999/02/01 12:08:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 093f35b30..fe69c6210 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -6,7 +6,7 @@ Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index d028980bd..e42822600 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.4 2003/02/18 19:10:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index b0d9de058..c5b3c613a 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -102,7 +102,7 @@ * o Error checking. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.3 2002/12/21 02:35:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53 tsi Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre index f2d2ae9ec..ea76684f3 100644 --- a/hw/xfree86/utils/gtf/gtf.man.pre +++ b/hw/xfree86/utils/gtf/gtf.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $ +.\" $XFree86$ .TH GTF 1 __vendorversion__ .SH NAME gtf - calculate VESA GTF mode lines diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c index 4bb20ef1b..bd42f637f 100644 --- a/hw/xfree86/utils/ioport/ioport.c +++ b/hw/xfree86/utils/ioport/ioport.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */ /* - * Copyright 2002 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index f7d07eb79..3c3c535ac 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */ /* Keyboard mode control program for 386BSD */ diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre index 677663d7e..3f7842cfd 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.4 1998/04/05 02:28:42 dawes Exp $ .TH KBD_MODE 1 __vendorversion__ .SH NAME kbd_mode \- recover the PC console keyboard diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c index e70fb2db7..1b5c08563 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.12 2003/10/07 21:39:43 herrb Exp $ */ +/* $XFree86: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */ /* static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13"; diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre index 528ed12f0..367b4fc9a 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.6 2001/01/27 18:20:41 dawes Exp $ .\" .TH KBD_MODE 1 __xorgversion__ .SH NAME diff --git a/hw/xfree86/utils/pcitweak/pcitweak.man.pre b/hw/xfree86/utils/pcitweak/pcitweak.man.pre index 14cfa885f..3549d9740 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.man.pre +++ b/hw/xfree86/utils/pcitweak/pcitweak.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.4 2003/05/29 21:48:09 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ .TH PCITWEAK 1 __vendorversion__ .SH NAME pcitweak - read/write PCI config space diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index 6093bd31a..5746269f5 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.92 2003/02/13 12:17:14 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre index baf231603..2c9bcc964 100644 --- a/hw/xfree86/utils/scanpci/scanpci.man.pre +++ b/hw/xfree86/utils/scanpci/scanpci.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.2 2000/12/11 20:18:45 dawes Exp $ .TH SCANPCI 1 __vendorversion__ .SH NAME scanpci - scan/probe PCI buses diff --git a/hw/xfree86/utils/xorgcfg/TODO b/hw/xfree86/utils/xorgcfg/TODO index 75fe91b95..b830f7529 100644 --- a/hw/xfree86/utils/xorgcfg/TODO +++ b/hw/xfree86/utils/xorgcfg/TODO @@ -1,4 +1,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,v 1.1 2001/07/04 16:09:14 paulo Exp $ +$XFree86$ o Have code to fetch the SymTabRec chipset list from a video driver. This is mostly useful for the testing tool/interface, so that the diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c index 40727ff62..53163e070 100644 --- a/hw/xfree86/utils/xorgcfg/accessx.c +++ b/hw/xfree86/utils/xorgcfg/accessx.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.10 2002/12/05 19:31:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c index 5299025f1..7db0e2f85 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.c +++ b/hw/xfree86/utils/xorgcfg/card-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h index 14411440d..156da456f 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.h +++ b/hw/xfree86/utils/xorgcfg/card-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card.xbm b/hw/xfree86/utils/xorgcfg/card.xbm index b3cbba322..231adcaae 100644 --- a/hw/xfree86/utils/xorgcfg/card.xbm +++ b/hw/xfree86/utils/xorgcfg/card.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ #define card_width 50 #define card_height 44 diff --git a/hw/xfree86/utils/xorgcfg/card.xpm b/hw/xfree86/utils/xorgcfg/card.xpm index d68257469..32bccb689 100644 --- a/hw/xfree86/utils/xorgcfg/card.xpm +++ b/hw/xfree86/utils/xorgcfg/card.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ static char * card_xpm[] = { "41 40 8 1", diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c index d5805fa98..b63fb3393 100644 --- a/hw/xfree86/utils/xorgcfg/cards.c +++ b/hw/xfree86/utils/xorgcfg/cards.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.15 2003/02/15 05:37:58 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $ */ #define CARDS_PRIVATE diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h index 0e5ee328f..a6637a664 100644 --- a/hw/xfree86/utils/xorgcfg/cards.h +++ b/hw/xfree86/utils/xorgcfg/cards.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.3 2002/07/15 20:46:04 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/computer.xpm b/hw/xfree86/utils/xorgcfg/computer.xpm index 75fc85b26..9167e3eaf 100644 --- a/hw/xfree86/utils/xorgcfg/computer.xpm +++ b/hw/xfree86/utils/xorgcfg/computer.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $ + * $XFree86$ */ static char * computer_xpm[] = { "30 50 8 1", diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c index 8c2da3d9b..e241b2e14 100644 --- a/hw/xfree86/utils/xorgcfg/config.c +++ b/hw/xfree86/utils/xorgcfg/config.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 6d1193a3d..990f7d01d 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -26,20 +26,23 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.17 2003/06/10 17:03:55 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xmu/SysUtil.h> +#include <X11/Xos.h> #include <stdio.h> #include <stdlib.h> #include <dirent.h> #include <string.h> -#include <unistd.h> -#if defined(sun) && defined(SVR4) +#ifdef sun +#undef index +#undef rindex #include <strings.h> #endif +#include <unistd.h> #include <stdarg.h> diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c index a3dfcbe2d..bd0182585 100644 --- a/hw/xfree86/utils/xorgcfg/expert.c +++ b/hw/xfree86/utils/xorgcfg/expert.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c index 2ae68a082..92283cd22 100644 --- a/hw/xfree86/utils/xorgcfg/help.c +++ b/hw/xfree86/utils/xorgcfg/help.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h index f03e01b14..ba97da009 100644 --- a/hw/xfree86/utils/xorgcfg/help.h +++ b/hw/xfree86/utils/xorgcfg/help.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $ + * $XFree86$ */ /* help string definitions */ diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index 68a1873ed..053b82257 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 87989fdc2..3482653b8 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.22 2003/01/01 19:22:24 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h index 6ff63c002..9de55e65e 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.3 2001/03/02 22:39:27 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xbm b/hw/xfree86/utils/xorgcfg/keyboard.xbm index 69d4aac42..5114bee3e 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard.xbm +++ b/hw/xfree86/utils/xorgcfg/keyboard.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $ + * $XFree86$ */ #define keyboard_width 50 #define keyboard_height 44 diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xpm b/hw/xfree86/utils/xorgcfg/keyboard.xpm index 5ef7b605d..200ba7f42 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard.xpm +++ b/hw/xfree86/utils/xorgcfg/keyboard.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $ + * $XFree86$ */ static char * card_xpm[] = { "60 28 5 1", diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index ddfa2903f..476da2a69 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -26,6 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * + * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1.4.1.4.2 2004/03/04 20:16:50 kaleb Exp $ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ @@ -35,12 +36,19 @@ #include "loader.h" #include "stubs.h" #include <X11/Xresource.h> +#include <X11/Xos.h> #ifdef USE_MODULES #include <stdio.h> #include <stdlib.h> #include <string.h> +#if defined(X_POSIX_C_SOURCE) +#define _POSIX_C_SOURCE X_POSIX_C_SOURCE #include <setjmp.h> +#undef _POSIX_C_SOURCE +#else +#include <setjmp.h> +#endif #include <signal.h> #include <ctype.h> diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index f3f8490bc..3ba5b937a 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.7 2001/07/09 23:45:24 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index e3f4e9f47..5dfbe442b 100644 --- a/hw/xfree86/utils/xorgcfg/loadmod.c +++ b/hw/xfree86/utils/xorgcfg/loadmod.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $ */ #ifdef USE_MODULES @@ -182,7 +182,7 @@ LOOKUP xfree86LookupTab[] = { SYMFUNC(xf86memchr) SYMFUNC(xf86memcmp) SYMFUNC(xf86memcpy) -#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) +#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__amd64__) /* * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle * structure copies. This causes a problem both here and in shared diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c index 6ed095416..04def80e2 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h index 03ca18a41..b7b16e15b 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.3 2000/11/30 20:55:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor.xbm b/hw/xfree86/utils/xorgcfg/monitor.xbm index c4b01eb74..972388a92 100644 --- a/hw/xfree86/utils/xorgcfg/monitor.xbm +++ b/hw/xfree86/utils/xorgcfg/monitor.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ #define monitor_width 50 #define monitor_height 44 diff --git a/hw/xfree86/utils/xorgcfg/monitor.xpm b/hw/xfree86/utils/xorgcfg/monitor.xpm index c694edf2e..e647e3cc1 100644 --- a/hw/xfree86/utils/xorgcfg/monitor.xpm +++ b/hw/xfree86/utils/xorgcfg/monitor.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ static char * monitor_xpm[] = { "47 40 6 1", diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 17a1c0caf..779f21130 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h index 249f50840..6c67d9d5e 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse.xbm b/hw/xfree86/utils/xorgcfg/mouse.xbm index 8577137e6..3f6bce72f 100644 --- a/hw/xfree86/utils/xorgcfg/mouse.xbm +++ b/hw/xfree86/utils/xorgcfg/mouse.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $ + * $XFree86$ */ #define mouse_width 50 #define mouse_height 44 diff --git a/hw/xfree86/utils/xorgcfg/mouse.xpm b/hw/xfree86/utils/xorgcfg/mouse.xpm index 7ad21fb8f..ea157c266 100644 --- a/hw/xfree86/utils/xorgcfg/mouse.xpm +++ b/hw/xfree86/utils/xorgcfg/mouse.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $ + * $XFree86$ */ static char * mouse_xpm[] = { "26 35 8 1", diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c index 10828a94a..8aa9a09a8 100644 --- a/hw/xfree86/utils/xorgcfg/options.c +++ b/hw/xfree86/utils/xorgcfg/options.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.12 2001/11/03 20:32:31 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $ */ #include "options.h" diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h index a90072607..4194593d1 100644 --- a/hw/xfree86/utils/xorgcfg/options.h +++ b/hw/xfree86/utils/xorgcfg/options.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.7 2001/07/06 02:04:10 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c index 9390afc6d..26e675a8f 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.c +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h index a152f6188..c7174b626 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.h +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c index 25fd5f290..80f4235af 100644 --- a/hw/xfree86/utils/xorgcfg/screen.c +++ b/hw/xfree86/utils/xorgcfg/screen.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h index 7c3e2c75f..624d87b96 100644 --- a/hw/xfree86/utils/xorgcfg/screen.h +++ b/hw/xfree86/utils/xorgcfg/screen.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.3 2000/12/01 18:31:07 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 23b0ecf5a..038f21d38 100644 --- a/hw/xfree86/utils/xorgcfg/startx.c +++ b/hw/xfree86/utils/xorgcfg/startx.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.8 2002/10/19 20:04:21 herrb Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index 6496bc868..702851077 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.c +++ b/hw/xfree86/utils/xorgcfg/stubs.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h index d554ac17a..e9cfbe2e0 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.h +++ b/hw/xfree86/utils/xorgcfg/stubs.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.3 2001/08/01 00:44:57 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $ */ #ifndef _xf86cfg_stubs_h diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 2011d1abd..3a257d047 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c index 3a51310d9..595abf419 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.c +++ b/hw/xfree86/utils/xorgcfg/vidmode.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $ */ /* diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h index e445517cd..8cdc4dc92 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.h +++ b/hw/xfree86/utils/xorgcfg/vidmode.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.3 2001/07/07 23:00:43 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $ */ #ifndef _xf86cfg_vidmode_h diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c index cb4054a5e..e36915888 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.c +++ b/hw/xfree86/utils/xorgcfg/xf86config.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h index 575c3c9d0..1095246b7 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.h +++ b/hw/xfree86/utils/xorgcfg/xf86config.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.4 2000/11/30 20:55:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index 83d8840ea..857135de4 100644 --- a/hw/xfree86/utils/xorgconfig/Cards +++ b/hw/xfree86/utils/xorgconfig/Cards @@ -18,7 +18,7 @@ # The majority of entries are just a binding of a model name to a # chipset/server and untested. # -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.79 2002/10/16 01:31:05 dawes Exp $ # VGA diff --git a/hw/xfree86/utils/xorgconfig/Cards98 b/hw/xfree86/utils/xorgconfig/Cards98 index cfd96dc16..ef14a0345 100644 --- a/hw/xfree86/utils/xorgconfig/Cards98 +++ b/hw/xfree86/utils/xorgconfig/Cards98 @@ -1,4 +1,4 @@ -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree98/xf86config/Cards98,v 1.7 1998/06/04 16:43:45 hohndel Exp $ # # # diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index 8aac06606..d5f405f4a 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index c5299e899..1d9892491 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */ diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 07659d943..9cc8be74d 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 30756119d..2f49ffd9b 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.3 2003/11/14 14:58:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */ /* * XFree86 vbe module @@ -60,7 +60,8 @@ typedef struct vbeControllerInfoBlock { CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(SCO) || defined(__USLC__) || \ + defined(__SUNPRO_C) #pragma pack() /* All GCC versions recognise this syntax */ #else #pragma pack(0) diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index ae16d7b75..b3951f8f9 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -27,7 +27,7 @@ * * Authors: David Dawes <dawes@xfree86.org> * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index b3c57b917..c37cbd8bf 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -26,7 +26,7 @@ * * Authors: David Dawes <dawes@xfree86.org> * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ #ifndef _VBE_MODES_H diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index 65b161a2c..0347f7fb7 100644 --- a/hw/xfree86/vbe/vbe_module.c +++ b/hw/xfree86/vbe/vbe_module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */ #include "xf86.h" #include "xf86str.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index a70f572b5..28f8b6fc7 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index e1fd9716a..b8bcbdba9 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.58 2003/11/03 05:11:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.59 2004/02/11 22:06:22 tsi Exp $ */ /* * @@ -764,6 +764,11 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) #if 0 hwp->writeAttr(hwp, 0x10, 0x01); /* graphics mode */ #endif + + hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ + hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ + hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ + if (scrninfp->depth == 4) { /* GJA */ hwp->writeGr(hwp, 0x03, 0x00); /* don't rotate, write unmodified */ @@ -774,10 +779,7 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) #ifdef SAVE_FONT1 if (hwp->FontInfo1) { hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x02); /* read plane 2 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_tobus(hwp->FontInfo1, hwp->Base, FONT_AMOUNT); } #endif @@ -785,10 +787,7 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) #ifdef SAVE_FONT2 if (hwp->FontInfo2) { hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x03); /* read plane 3 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_tobus(hwp->FontInfo2, hwp->Base, FONT_AMOUNT); } #endif @@ -796,16 +795,10 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) #ifdef SAVE_TEXT if (hwp->TextInfo) { hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x00); /* read plane 0 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_tobus(hwp->TextInfo, hwp->Base, TEXT_AMOUNT); hwp->writeSeq(hwp, 0x02, 0x02); /* write to plane 1 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x01); /* read plane 1 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_tobus((unsigned char *)hwp->TextInfo + TEXT_AMOUNT, hwp->Base, TEXT_AMOUNT); } @@ -849,8 +842,7 @@ vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore) for (i = 1; i < restore->numSequencer; i++) hwp->writeSeq(hwp, i, restore->Sequencer[i]); - /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 or CRTC[17] */ - + /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 of CRTC[17] */ hwp->writeCrtc(hwp, 17, restore->CRTC[17] & ~0x80); for (i = 0; i < restore->numCRTC; i++) @@ -958,39 +950,32 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) #if 0 hwp->writeAttr(hwp, 0x10, 0x01); /* graphics mode */ #endif + + hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ + hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ + hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ + #ifdef SAVE_FONT1 if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) { hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x02); /* read plane 2 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT); } #endif /* SAVE_FONT1 */ #ifdef SAVE_FONT2 if (hwp->FontInfo2 || (hwp->FontInfo2 = xalloc(FONT_AMOUNT))) { hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x03); /* read plane 3 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT); } #endif /* SAVE_FONT2 */ #ifdef SAVE_TEXT if (hwp->TextInfo || (hwp->TextInfo = xalloc(2 * TEXT_AMOUNT))) { hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x00); /* read plane 0 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT); hwp->writeSeq(hwp, 0x02, 0x02); /* write to plane 1 */ - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ hwp->writeGr(hwp, 0x04, 0x01); /* read plane 1 */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ slowbcopy_frombus(hwp->Base, (unsigned char *)hwp->TextInfo + TEXT_AMOUNT, TEXT_AMOUNT); } @@ -1476,7 +1461,7 @@ vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, regp->CRTC[22] = i & 0xFF; ExtBits = i & 0xFF00; } - return ExtBits >> 8; + return ExtBits >> 8; } /* 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 110be9848..1294640df 100644 --- a/hw/xfree86/x86emu/decode.c +++ b/hw/xfree86/x86emu/decode.c @@ -37,6 +37,7 @@ * ****************************************************************************/ +/* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.1.4.1.4.2 2004/03/05 12:46:30 eich Exp $ */ /* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */ #include "x86emu/x86emui.h" @@ -699,7 +700,11 @@ u16* decode_rm_seg_register( DECODE_PRINTF("DS"); return &M.x86.R_DS; case 4: + DECODE_PRINTF("FS"); + return &M.x86.R_FS; case 5: + DECODE_PRINTF("GS"); + return &M.x86.R_GS; case 6: case 7: DECODE_PRINTF("ILLEGAL SEGREG"); 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 55f361677..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.6 2003/10/22 20:03:06 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.6tsi Exp $ */ #include "x86emu/x86emui.h" @@ -1746,16 +1746,16 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) START_OF_INSTR(); FETCH_DECODE_MODRM(mod, rh, rl); switch (rh) { - case 3: + case 4: DECODE_PRINTF("BT\t"); break; - case 4: + case 5: DECODE_PRINTF("BTS\t"); break; - case 5: + case 6: DECODE_PRINTF("BTR\t"); break; - case 6: + case 7: DECODE_PRINTF("BTC\t"); break; default: @@ -1780,13 +1780,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_long(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_long(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_long(srcoffset, srcval ^ mask); break; default: @@ -1805,13 +1805,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_word(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_word(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_word(srcoffset, srcval ^ mask); break; default: @@ -1833,13 +1833,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_long(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_long(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_long(srcoffset, srcval ^ mask); break; default: @@ -1858,13 +1858,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_word(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_word(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_word(srcoffset, srcval ^ mask); break; default: @@ -1886,13 +1886,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_long(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_long(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_long(srcoffset, srcval ^ mask); break; default: @@ -1911,13 +1911,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(srcval & mask,F_CF); switch (rh) { - case 4: + case 5: store_data_word(srcoffset, srcval | mask); break; - case 5: + case 6: store_data_word(srcoffset, srcval & ~mask); break; - case 6: + case 7: store_data_word(srcoffset, srcval ^ mask); break; default: @@ -1939,13 +1939,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF); switch (rh) { - case 4: + case 5: *srcreg |= mask; break; - case 5: + case 6: *srcreg &= ~mask; break; - case 6: + case 7: *srcreg ^= mask; break; default: @@ -1964,13 +1964,13 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2)) mask = (0x1 << bit); CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF); switch (rh) { - case 4: + case 5: *srcreg |= mask; break; - case 5: + case 6: *srcreg &= ~mask; break; - case 6: + case 7: *srcreg ^= mask; break; default: 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/hw/xfree86/xaa/XAA.HOWTO b/hw/xfree86/xaa/XAA.HOWTO index 95d9d6100..cbd71c138 100644 --- a/hw/xfree86/xaa/XAA.HOWTO +++ b/hw/xfree86/xaa/XAA.HOWTO @@ -1424,4 +1424,4 @@ void DisableClipping (ScrnInfoPtr pScrn) pixmap with a particular dimension is allowed, then your driver will be expected to render primitives as large as that pixmap. -$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $ diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index f183f8f02..98db3cf50 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 83850767a..5bde21cbe 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */ /* This is a lighter version of cfbBitBlt. We calculate the boxes diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index d7f3ba2a3..ce19a853e 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ #include "Xmd.h" CARD32 XAAReverseBitOrder(CARD32 v); diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 9a8749dbf..272b9fb42 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 497c3e7a1..7a036937b 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index d3d1c8a5c..9e17a187f 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index b77be1ad6..e4439c447 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 212116ae4..e5eba7819 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 01b4bb408..6bc7bfed3 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 352d8e084..95ecf257b 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -21,7 +21,7 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 5566f51e6..4ba1cd853 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ /* * Copyright 1996 The XFree86 Project diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index cda56e327..7571ce3ca 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index c9ef93a1b..b7a177521 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index ab6cb9a24..3eab6d46a 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index c3db7ff57..b7ee997e3 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 5237e8b2c..186711e3f 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 1b1bc1830..7233e215c 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 2084e8d61..3149acf5c 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 370921002..8afd479b7 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 234d242c4..514a8cf42 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index e1c57588a..914631b58 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 0fb1db365..b50b31bb0 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index d527b7c15..42a9428c4 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.3.2.3 2004/03/04 20:16:48 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 5cce3e7ed..eb20ea8dd 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ #include "misc.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index c7756ba93..25f8bd486 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 2adf42466..1cf6c3422 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.2.2.3 2004/03/04 20:16:48 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index fecbbcfa0..af3380231 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -219,6 +219,9 @@ XAADoComposite ( ySrc += pSrc->pDrawable->y; if(pMask) { + if(pMask->componentAlpha) + return FALSE; + /* for now we only do it if there is a 1x1 (solid) source */ if((pSrc->pDrawable->width == 1) && (pSrc->pDrawable->height == 1)) { diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 4075bab6a..70a7b1d7d 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index fe8d70de2..999d7177d 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 522225665..356774c29 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index b27a54e81..56cd9e3c4 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 862f50ba0..8b111d1cf 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ #include "xaa.h" #include "xaalocal.h" diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 845dccd4e..0fd572617 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaTEGlyphBlt.S b/hw/xfree86/xaa/xaaTEGlyphBlt.S index f5c580760..5f3137f45 100644 --- a/hw/xfree86/xaa/xaaTEGlyphBlt.S +++ b/hw/xfree86/xaa/xaaTEGlyphBlt.S @@ -21,7 +21,7 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.1 1999/07/10 07:24:54 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 82fa28674..49089afb3 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index 0d2ce760a..6c16f11d3 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */ /* * This is a table of 24-bit values, indexed with an 8-bit byte value, then diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index f999b425f..fedd8f44d 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 276f01672..933d8f733 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ #include "Xarch.h" diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 4504deffd..04d8d154a 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 8fee07533..048ed00fc 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */ +/* $XFree86$ */ /* diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index e6963c325..59f0a2cc7 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */ #define XAA_SCREEN_PROLOGUE(pScreen, field)\ ((pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index e72fa4316..a29332497 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh index a8f43eceb..514040776 100644 --- a/hw/xfree86/xf1bpp/mfbmap.sh +++ b/hw/xfree86/xf1bpp/mfbmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.1.2.3 1998/06/27 14:48:23 dawes Exp $ # # This script recreates the mapping list that maps the mfb external # symbols * to xf1bpp* (without "mfb") diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 94c029856..0134872e0 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh index 6b244e68e..44dc781fc 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.sh +++ b/hw/xfree86/xf1bpp/mfbunmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ # # This script recreates a header that undoes the effect of mfbmap.h # This should only be rerun if there have been changes in the mfb code diff --git a/hw/xfree86/xf4bpp/NOTES b/hw/xfree86/xf4bpp/NOTES index f9ccc95c1..e3b77dcfd 100644 --- a/hw/xfree86/xf4bpp/NOTES +++ b/hw/xfree86/xf4bpp/NOTES @@ -191,4 +191,4 @@ MORE NOTES: -$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.2 1998/07/25 16:59:26 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.1.2.2 1998/06/27 15:15:45 dawes Exp $ diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 3891f1e21..9b5ea57ea 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index e9ac98dc9..4a347b5d1 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index 42f118aac..a7f115682 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index 650c448b8..1e2d095ee 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index f99ce33e0..15231a653 100644 --- a/hw/xfree86/xf4bpp/ibmTrace.h +++ b/hw/xfree86/xf4bpp/ibmTrace.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index 300256021..82b17e59e 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index 560995957..29b816a3a 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index 4c4d8eab6..5d677174d 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index 3d6c3df52..c53edd19d 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index a5d5b5b37..b4f5bd014 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index c2717599f..b200a611e 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 7ca32d903..106fc6ae5 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */ /************************************************************ diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index 1d118863f..e684bf118 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 40e9d5b32..0d1a2075b 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index a1f49a486..295f52159 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index a68f5faff..aef3c2dd5 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index cd307fe94..87b387176 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index 86b7d6f6c..c6df4ef41 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 919fa0133..5c3aff6f6 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index af1ecb95e..ec9032e57 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index df8ae335f..bbc64c97c 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 341e17534..78273ca23 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index b6c404e80..00cd985a7 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index f6999c561..02019b19a 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */ /* Copyright (c) 1990 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 275db433a..948359a30 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index c009d696e..66b547e59 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 2317fbdfa..c3085bc4b 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index f52343fc9..65ff055d2 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index d080a623f..736d128c6 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 754eb3732..8bb43eea4 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 57d5fcff8..267eef0ef 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index 5d33bc3c9..47e427755 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 81294b2cc..9c3464de1 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index 7ea244f66..bc56ca1fc 100644 --- a/hw/xfree86/xf4bpp/ppcSpMcro.h +++ b/hw/xfree86/xf4bpp/ppcSpMcro.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index fc38cdcfe..ff59fccff 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index 1de8d68ee..a1c7afd9d 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index 660cc356b..dc7b7965a 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* GJA -- span move routines */ diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index 867e2c50e..39597d268 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index 4357e4d8a..a03f21d2b 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index 43f59d938..a3596e6a3 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index b3711f852..6cd15e9f5 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index f5ace74d0..316b4a49b 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index ecc2fa738..345492c59 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index 3509ce77f..f3acf8123 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 5fd303d7d..1c7261eb9 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 59458a258..976f27e32 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ #ifndef __XF4BPP_H__ diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index b7fa9fd00..a4a3bda22 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.2 1999/03/28 15:33:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ #ifndef _CFB8_16_H #define _CFB8_16_H diff --git a/hw/xfree86/xf8_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c index d0d1974e7..b2b126d95 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16module.c +++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ +/* $XFree86$ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index 5e19fb7a2..cb4b8d726 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -4,7 +4,7 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index 757b0dc49..277abafc8 100644 --- a/hw/xfree86/xf8_16bpp/cfbwindow.c +++ b/hw/xfree86/xf8_16bpp/cfbwindow.c @@ -4,7 +4,7 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index 30bc1a0fa..98a50f810 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ #ifndef _CFB8_32_H #define _CFB8_32_H diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c index 9ed6b2018..2c8f203f8 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32module.c +++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 581efb4f6..3ebddd2d2 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 #include "cfb.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 53af8f7d8..2bfda9f6f 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index 248ca0869..b08288f19 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index 6c13ca721..f55aeb86c 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index d8a6f4608..635861bb5 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index d01b2b5cb..19f9055e3 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index e737e025e..0510ae3c5 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 516decd6c..62026768e 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.2.2.3 2004/03/04 20:16:51 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 7f123d36a..93323d487 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index c18b54399..3576a41c3 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 998503c21..226835249 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */ /* Copyright (C) 1998. The XFree86 Project Inc. diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h index 9913c2a6c..2168054d9 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #ifndef _CFB8_32WID_H #define _CFB8_32WID_H diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c index 5a47b9ff5..83b6118bb 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c +++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index 93c15371d..8f307034f 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -7,7 +7,7 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index 0aa894176..b16266e93 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index b7ac739b3..b11f05f1d 100644 --- a/hw/xfree86/xf8_32wid/cfbwindow.c +++ b/hw/xfree86/xf8_32wid/cfbwindow.c @@ -7,7 +7,7 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 488179d01..0da0d5006 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index dc2ac9de0..a0c586bcb 100644 --- a/hw/xnest/Args.h +++ b/hw/xnest/Args.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTARGC_H #define XNESTARGS_H diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index ae5ded5e3..bcebc10cd 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index 0b3c22581..9ce72a946 100644 --- a/hw/xnest/Color.h +++ b/hw/xnest/Color.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTCOLOR_H #define XNESTCOLOR_H diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 52ba867cf..146e7ebd0 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 1a8703063..301ab139a 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */ #include <X11/X.h> diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index 044f8f131..78df26969 100644 --- a/hw/xnest/Display.h +++ b/hw/xnest/Display.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.6 2001/01/17 22:36:55 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 6f52b286b..7b96bdfee 100644 --- a/hw/xnest/Drawable.h +++ b/hw/xnest/Drawable.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86$ */ #ifndef XNESTDRAWABLE_H #define XNESTDRAWABLE_H diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 1b7b3935f..a36e0d8e8 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index ed0fbb830..9ed211cb8 100644 --- a/hw/xnest/Events.h +++ b/hw/xnest/Events.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTEVENTS_H #define XNESTEVENTS_H diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index f70848854..a0256c313 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xatom.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 972849d9a..7141e9cb9 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index b43695c96..042a29f6e 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index 722dde470..ccdc40ebe 100644 --- a/hw/xnest/GCOps.h +++ b/hw/xnest/GCOps.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTGCOPS_H #define XNESTGCOPS_H diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c index 3db9b8596..1ffc54764 100644 --- a/hw/xnest/GetTime.c +++ b/hw/xnest/GetTime.c @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xos.h" diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 693c7296b..5344e4e50 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index ae92352d1..9a1e809cc 100644 --- a/hw/xnest/Handlers.h +++ b/hw/xnest/Handlers.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTHANDLERS_H #define XNESTHANDLERS_H diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 4809d5c7c..53c9f73f4 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.25 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index eb9291878..bda078023 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index 5f8dc3cb4..480231860 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTKEYBOARD_H #define XNESTKEYBOARD_H diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index b82dfa49b..5a92dc271 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 1af5f02ec..853a48955 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 0b06e5021..27a2011b8 100644 --- a/hw/xnest/Pointer.h +++ b/hw/xnest/Pointer.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTPOINTER_H #define XNESTPOINTER_H diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 686884555..3412edfb8 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index 96260435b..f35a2872d 100644 --- a/hw/xnest/Screen.h +++ b/hw/xnest/Screen.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTSCREEN_H #define XNESTSCREEN_H diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c index f153b5b2c..d7006207a 100644 --- a/hw/xnest/TestExt.c +++ b/hw/xnest/TestExt.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */ #include <X11/X.h> #include <X11/Xproto.h> diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index bcf7881eb..f88e587b9 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index 14e0085dc..dfa74dbdc 100644 --- a/hw/xnest/Visual.h +++ b/hw/xnest/Visual.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTVISUAL_H #define XNESTVISUAL_H diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 14ddac082..f7e04844e 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index 7d9426d72..b396c80b5 100644 --- a/hw/xnest/XNCursor.h +++ b/hw/xnest/XNCursor.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.2 2002/11/23 19:27:50 tsi Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 34d236f3b..7fb4017bd 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTFONT_H diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index bbec67120..56939cceb 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTGC_H #define XNESTGC_H diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index 4e4d9c40c..fab1843d1 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index 8b5f39115..cc49b2343 100644 --- a/hw/xnest/XNWindow.h +++ b/hw/xnest/XNWindow.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.3 2003/11/03 05:36:34 tsi Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index 64b09de7e..ade73833f 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */ +/* $XFree86$ */ /* ** Machines with a 64 bit library interface and a 32 bit server require diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/Xnest.man.pre index 488489189..131c224f2 100644 --- a/hw/xnest/Xnest.man.pre +++ b/hw/xnest/Xnest.man.pre @@ -25,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.7 2003/10/24 17:22:33 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $ .\" .TH XNEST 1 __xorgversion__ .SH NAME diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 15282d206..2e3b7b399 100644 --- a/hw/xnest/os2Stub.c +++ b/hw/xnest/os2Stub.c @@ -26,7 +26,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.1 2002/05/31 18:46:04 dawes Exp $ */ /* This below implements select() for calls in xnest. It has been */ /* somewhat optimized for improved performance, but assumes a few */ diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index 052f34b7f..c14684c96 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -26,7 +26,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */ #include "win.h" #ifdef XWIN_CLIPBOARD diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index d080a10e3..d0ae06dd5 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.35 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */ #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man index e76d6d2ed..e7a1c1a32 100644 --- a/hw/xwin/XWin.man +++ b/hw/xwin/XWin.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.7 2003/10/02 13:30:09 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.5 2002/07/05 09:19:25 alanh Exp $ .TH XWIN 1 __vendorversion__ .SH NAME XWin \- X Server for the Cygwin environment on Microsoft Windows diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc index e696d9772..77edea005 100644 --- a/hw/xwin/XWin.rc +++ b/hw/xwin/XWin.rc @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.1 2002/10/17 08:18:21 alanh Exp $ */ #include "winresource.h" diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index b67a556b5..2ca4f3462 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xwin/ddraw.h,v 1.4 2001/07/29 22:08:15 tsi Exp $ */ +/* $XFree86$ */ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H diff --git a/hw/xwin/win.h b/hw/xwin/win.h index ba7203b48..1216af090 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.37 2003/10/02 13:30:09 eich Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index eb46f0ad9..072fb494e 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -28,7 +28,7 @@ * Authors: Keith Packard, MIT X Consortium * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.12 2002/10/31 23:04:39 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 589aae493..b785ea3fd 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.5 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c index a829e8eb9..b8d10365d 100644 --- a/hw/xwin/winclip.c +++ b/hw/xwin/winclip.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.1 2001/04/05 20:13:49 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h index fae68400e..31da418fd 100644 --- a/hw/xwin/winclipboard.h +++ b/hw/xwin/winclipboard.h @@ -29,7 +29,7 @@ * * Authors: Harold Hunt */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* Standard library headers */ #include <assert.h> diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c index 52e03999b..1b72d27e2 100644 --- a/hw/xwin/winclipboardinit.c +++ b/hw/xwin/winclipboardinit.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardinit.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "dixstruct.h" #include "winclipboard.h" diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c index ffce06ff5..537f8ca2b 100644 --- a/hw/xwin/winclipboardtextconv.c +++ b/hw/xwin/winclipboardtextconv.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardtextconv.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" #include <stdio.h> diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c index db997308e..840e5923a 100644 --- a/hw/xwin/winclipboardthread.c +++ b/hw/xwin/winclipboardthread.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" #include "X11/Xauth.h" diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c index d71d3fe0d..bef2f109a 100644 --- a/hw/xwin/winclipboardunicode.c +++ b/hw/xwin/winclipboardunicode.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c index db1e1634b..81bca018b 100644 --- a/hw/xwin/winclipboardwndproc.c +++ b/hw/xwin/winclipboardwndproc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c index 49cca10fb..ee0f53ff9 100644 --- a/hw/xwin/winclipboardxevents.c +++ b/hw/xwin/winclipboardxevents.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index 1f637a694..78a1e5694 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.10 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index b2f62404b..76b8aeabe 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "winconfig.h" diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 3936ebd1b..8ccaddf14 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.7 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.4 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" #include "shellapi.h" diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 88ef65a86..c74901a27 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.6 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index 87b4d4236..a025a402a 100755 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/windialogs.c,v 1.1 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: $ */ #include "win.h" diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index 27d7fa2aa..ff747c66c 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.5 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.3 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 1474a3116..4f320549d 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.6 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.3 2001/10/23 22:22:47 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 7f1cd8719..b0633fa7a 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.10 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c index 97bd7967b..a6ff2f7da 100644 --- a/hw/xwin/winfont.c +++ b/hw/xwin/winfont.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.3 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c index c98e147e0..a7c27f076 100644 --- a/hw/xwin/wingc.c +++ b/hw/xwin/wingc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.10 2001/10/30 15:39:09 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index 49ba7f2fb..79dc5eb53 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index bef742a33..1d68d72f5 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index d6f416d28..f320c98e7 100644 --- a/hw/xwin/winkeybd.h +++ b/hw/xwin/winkeybd.h @@ -29,7 +29,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.1 2001/09/26 13:00:34 alanh Exp $ */ /* * We need symbols for the scan codes of keys. diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c index dfb63bc58..478759f11 100644 --- a/hw/xwin/winmisc.c +++ b/hw/xwin/winmisc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.6 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 087df5429..86e0d629d 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.4 2001/10/29 21:10:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index 0468f3018..fd07ec690 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -29,7 +29,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.2 2001/04/18 17:14:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.1 2001/04/05 20:13:50 dawes Exp $ */ #undef MINSHORT #undef MAXSHORT diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index 4e98f6d8b..8f7feb8fb 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 169698d09..73d331c90 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -29,7 +29,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ /* diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index 30f90a53d..2f77e719e 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ #include "X11/Xatom.h" #include "propertyst.h" diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h index 64184c6e1..1bca0e4e8 100755 --- a/hw/xwin/winmultiwindowclass.h +++ b/hw/xwin/winmultiwindowclass.h @@ -29,7 +29,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ /* diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 9d418431e..f362867bc 100755 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowicons.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 70f595243..ca80f3576 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -29,7 +29,7 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index faa78ea82..6868e205d 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -27,7 +27,7 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v 1.3 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* X headers */ #include <stdio.h> diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index fcf5f8c16..e028921c9 100755 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -29,7 +29,7 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.3 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index 44fd3a174..d9cce48d1 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.15 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index f71f9ce99..346b631c6 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.18 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 22c0fbdcc..e16157c4d 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -28,7 +28,7 @@ * Authors: drewry, september 1986 * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c index d28929d67..46d738209 100644 --- a/hw/xwin/winpntwin.c +++ b/hw/xwin/winpntwin.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.1 2001/04/05 20:13:50 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c index 948c34428..baafd8c39 100644 --- a/hw/xwin/winpolyline.c +++ b/hw/xwin/winpolyline.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.4 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.3 2001/09/13 08:25:45 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index bead229df..92216632a 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.c,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include <stdio.h> #include <stdlib.h> diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index bd3b7831b..9b2fda7e8 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -29,7 +29,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.h,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ /* Need Bool */ #include "Xdefs.h" diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l index 595a94a67..0a61c1283 100644 --- a/hw/xwin/winprefslex.l +++ b/hw/xwin/winprefslex.l @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefslex.l,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include <stdio.h> #include <stdlib.h> diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index bfee9c105..09941e6c9 100644 --- a/hw/xwin/winprefsyacc.y +++ b/hw/xwin/winprefsyacc.y @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefsyacc.y,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include <stdio.h> #include <stdlib.h> diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index 4a5e15264..9d7072e83 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c index 99f8d20f9..f22b2b0a5 100644 --- a/hw/xwin/winregistry.c +++ b/hw/xwin/winregistry.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winregistry.c,v 1.1 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c index 201acf1c9..ca78ee72e 100644 --- a/hw/xwin/winrop.c +++ b/hw/xwin/winrop.c @@ -27,7 +27,7 @@ * * Authors: Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winrop.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86$ */ /* * Raster operations used by Windows translated to X's 16 rop codes... diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index cd8c00a69..de733255d 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" #include "safeAlpha.h" diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index e313a14c4..e41d794c5 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index 0ce0f4681..8ed9db782 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.24 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index 5ef630375..b9da4f7ed 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index c0af4e3ad..195110bd0 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.23 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.21 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index 4b87d248a..a3e691b79 100755 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -28,7 +28,7 @@ * Authors: Early Ehlinger * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wintrayicon.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include "win.h" #include <shellapi.h> diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c index 8ff3bf7d0..8eb2cd855 100755 --- a/hw/xwin/winvideo.c +++ b/hw/xwin/winvideo.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.1tsi Exp $ */ #include "win.h" #include "Xv.h" diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index 6c783a180..3fbea2085 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.7 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 837053287..53cf9d813 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -29,7 +29,7 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.3 2003/10/02 13:30:11 eich Exp $ */ #ifndef NO #define NO 0 diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 76edc024d..8da36c9f6 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -31,7 +31,7 @@ * Harold L Hunt II * MATSUZAKI Kensuke */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" #include <commctrl.h> diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h index cb4ee6be4..7e015ebc4 100644 --- a/ilbm/ilbm.h +++ b/ilbm/ilbm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.2 1998/04/05 16:42:23 robin Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c index b148bc00c..f861b93e9 100644 --- a/ilbm/ilbmbitblt.c +++ b/ilbm/ilbmbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c index 455c07cb5..286a82474 100644 --- a/ilbm/ilbmblt.c +++ b/ilbm/ilbmblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */ +/* $XFree86$ */ /* * ilbm copy area */ diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index 4204c61b5..931da54fd 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index 75391e96b..1cd456bb1 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c index 8309e2600..2a12a39bc 100644 --- a/ilbm/ilbmbstore.c +++ b/ilbm/ilbmbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c index 4628e61d0..72d143e18 100644 --- a/ilbm/ilbmclip.c +++ b/ilbm/ilbmclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c index 10dadd968..06da361e2 100644 --- a/ilbm/ilbmcmap.c +++ b/ilbm/ilbmcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.0 1996/08/18 01:53:46 dawes Exp $ */ /* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c index f107e4692..28f2df91d 100644 --- a/ilbm/ilbmfillarc.c +++ b/ilbm/ilbmfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.0 1996/08/18 01:53:48 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c index 642a95f40..4c2507487 100644 --- a/ilbm/ilbmfillrct.c +++ b/ilbm/ilbmfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.0 1996/08/18 01:53:49 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c index 5564e5142..f7fe90743 100644 --- a/ilbm/ilbmfillsp.c +++ b/ilbm/ilbmfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.0 1996/08/18 01:53:50 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c index 50cf56773..05e89bd8d 100644 --- a/ilbm/ilbmfont.c +++ b/ilbm/ilbmfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */ +/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c index 8253d9cd4..259935c46 100644 --- a/ilbm/ilbmgc.c +++ b/ilbm/ilbmgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.0 1996/08/18 01:53:52 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index 727bafd39..e6adbae4a 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c index fe2638167..277ac722a 100644 --- a/ilbm/ilbmhrzvert.c +++ b/ilbm/ilbmhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c index d2f7a4df9..348d593a3 100644 --- a/ilbm/ilbmimage.c +++ b/ilbm/ilbmimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */ #include <stdio.h> /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c index 1bd6f02f9..24143fba3 100644 --- a/ilbm/ilbmimggblt.c +++ b/ilbm/ilbmimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.0 1996/08/18 01:53:57 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c index d831489c5..49dd7da46 100644 --- a/ilbm/ilbmline.c +++ b/ilbm/ilbmline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.0 1996/08/18 01:53:58 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index d85346aca..9717aceca 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c index ab5a33f2a..01b991892 100644 --- a/ilbm/ilbmpixmap.c +++ b/ilbm/ilbmpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c index b76a29892..41d4545e4 100644 --- a/ilbm/ilbmply1rct.c +++ b/ilbm/ilbmply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.0 1996/08/18 01:54:02 dawes Exp $ */ /* * $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c index a7dca5756..fdd0a071f 100644 --- a/ilbm/ilbmplygblt.c +++ b/ilbm/ilbmplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.0 1996/08/18 01:54:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c index 0199b0bc6..497eb50ee 100644 --- a/ilbm/ilbmpntarea.c +++ b/ilbm/ilbmpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c index 5cc29e331..787955a87 100644 --- a/ilbm/ilbmpntwin.c +++ b/ilbm/ilbmpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c index f313dc8d1..e35b85416 100644 --- a/ilbm/ilbmpolypnt.c +++ b/ilbm/ilbmpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.0 1996/08/18 01:54:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c index 6a045d242..5bedef851 100644 --- a/ilbm/ilbmpushpxl.c +++ b/ilbm/ilbmpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.0 1996/08/18 01:54:08 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c index 5a6fa71a0..f8b4eb52d 100644 --- a/ilbm/ilbmscrinit.c +++ b/ilbm/ilbmscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.4 1998/07/26 01:53:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index a18cf53f8..55073817d 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.0 1996/08/18 01:54:10 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c index dc42baee9..2c39ef7a9 100644 --- a/ilbm/ilbmtegblt.c +++ b/ilbm/ilbmtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.0 1996/08/18 01:54:11 dawes Exp $ */ /* $XConsortium: ilbmtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c index e289144ef..d6e815405 100644 --- a/ilbm/ilbmtile.c +++ b/ilbm/ilbmtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c index 524972944..fbf543de4 100644 --- a/ilbm/ilbmwindow.c +++ b/ilbm/ilbmwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c index 9bdf22155..9ac30e267 100644 --- a/ilbm/ilbmzerarc.c +++ b/ilbm/ilbmzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.0 1996/08/18 01:54:15 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/include/XIstubs.h b/include/XIstubs.h index ad36bc716..e005493c4 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/bstore.h b/include/bstore.h index c3a6a9f38..098abcd86 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/bstorestr.h b/include/bstorestr.h index 694841ed0..8f21855c4 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/closestr.h b/include/closestr.h index 34d5931f2..fcd64ed45 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */ #ifndef CLOSESTR_H diff --git a/include/colormap.h b/include/colormap.h index f249f4f03..e8b235529 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group diff --git a/include/cursor.h b/include/cursor.h index 7509a94af..40b2fbf59 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.1.4.4.4.3 2004/03/04 20:17:01 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/cursorstr.h b/include/cursorstr.h index 0e2f04a6d..3984245ad 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */ #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index a20b94e9c..20a182d2e 100644 --- a/include/dix.h +++ b/include/dix.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/dixevents.h b/include/dixevents.h index f80f3ab0b..46a5faef0 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/dixfont.h b/include/dixfont.h index 2a6877de2..d3bb69b0a 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 21992e786..042e063db 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/dixstruct.h b/include/dixstruct.h index 43920540f..9c39a8aec 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/include/exevents.h b/include/exevents.h index ea3804bd3..91c7acb6b 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/extension.h b/include/extension.h index 6b674f07f..34750173b 100644 --- a/include/extension.h +++ b/include/extension.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 107eee891..37fa9a245 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/extnsionst.h b/include/extnsionst.h index 0d7debe0b..daf37bf43 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index a886d77b8..2288e8491 100644 --- a/include/gc.h +++ b/include/gc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/gcstruct.h b/include/gcstruct.h index 43cc679b4..6feff51f5 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index 3b1b6ba0b..c2e98ea22 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.2.2.3 2004/03/04 20:17:01 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index acf3bca1a..fa88febda 100644 --- a/include/input.h +++ b/include/input.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */ #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index a8a834807..70627629b 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/include/misc.h b/include/misc.h index ffa65b31e..5944a427f 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/miscstruct.h b/include/miscstruct.h index 86f114792..f0ff25b28 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */ #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index b5a55a60b..09a3570f9 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */ #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/os.h b/include/os.h index e9328c8fa..4d45b571f 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/os.h,v 3.53 2003/10/29 04:17:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/pixmap.h b/include/pixmap.h index 56bb675ae..6cea329ec 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index d5bc21273..1b0df9fd3 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86$ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H diff --git a/include/property.h b/include/property.h index 66103bc8e..21a38d51c 100644 --- a/include/property.h +++ b/include/property.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */ #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index 5c335d038..177fca171 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */ #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H diff --git a/include/regionstr.h b/include/regionstr.h index b431d0b04..1d068ecc5 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.7.4.1 2004/03/04 17:48:21 eich Exp $ */ /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** @@ -45,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.11 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */ #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H @@ -167,19 +168,8 @@ extern RegDataRec miBrokenData; #else /* !NEED_SCREEN_REGIONS */ -/* Reference _pScreen macro argument and possibly check its type */ -#undef REGION_SCREEN -#if defined(NDEBUG) && !defined(DEBUG) && !defined(BUILDDEBUG) - -# define REGION_SCREEN(_pScreen_) (void)(_pScreen_) - -#else - -extern volatile ScreenPtr currentRegionScreen; - -# define REGION_SCREEN(_pScreen_) (void)(currentRegionScreen = (_pScreen_)) - -#endif +/* Reference _pScreen macro argument and check its type */ +#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum) #define REGION_CREATE(_pScreen, _rect, _size) \ (REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size)) @@ -257,8 +247,8 @@ extern volatile ScreenPtr currentRegionScreen; #define REGION_INIT(_pScreen, _pReg, _rect, _size) \ { \ REGION_SCREEN(_pScreen); \ - (_pReg)->extents = *(_rect); \ - (_pReg)->data = (RegDataPtr)NULL; \ + (_pReg)->extents = *(_rect); \ + (_pReg)->data = (RegDataPtr)NULL; \ } #define REGION_UNINIT(_pScreen, _pReg) \ diff --git a/include/resource.h b/include/resource.h index 6517ab212..49c189869 100644 --- a/include/resource.h +++ b/include/resource.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 diff --git a/include/screenint.h b/include/screenint.h index 988a7416c..b3e76c4c2 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 0f1813c00..edd14c12f 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/servermd.h b/include/servermd.h index 654e1411b..994f5c087 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -389,7 +389,7 @@ SOFTWARE. #endif /* ia64 */ -#if defined(__AMD64__) || defined(AMD64) +#if defined(__amd64__) || defined(amd64) # define IMAGE_BYTE_ORDER LSBFirst # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) diff --git a/include/site.h b/include/site.h index 1c272fc3f..be8c003da 100644 --- a/include/site.h +++ b/include/site.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */ #ifndef SITE_H #define SITE_H diff --git a/include/swaprep.h b/include/swaprep.h index b6671e7d9..2c026c659 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/swapreq.h b/include/swapreq.h index 59ba8c5be..9c59bbf84 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/include/validate.h b/include/validate.h index 2a13962a7..467533d22 100644 --- a/include/validate.h +++ b/include/validate.h @@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall 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/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */ #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index 0c886559e..5056512b8 100644 --- a/include/window.h +++ b/include/window.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 2dce443d3..8e8d2542a 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */ #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index bdc1682f5..cc4e519ce 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.5 2001/01/30 22:06:21 tsi Exp $ */ /* $XConsortium: ipl.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c index 57b8fce57..11e358944 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */ +/* $XFree86$ */ /* * $XConsortium: iplallpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $ * diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c index 27470382b..9105faa48 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.1tsi Exp $ */ /* * ipl copy area */ diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index 8a48bd9da..f303859cd 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */ +/* $XFree86$ */ /* * ipl copy area */ diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index 9d2b571db..47b895ea4 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index 7cc93e90c..dd096dfbd 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 5719ca308..422d10291 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */ +/* $XFree86$ */ /*- * iplbstore.c -- diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index 21abfdbb3..3b73b1481 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.0 1996/08/18 01:54:40 dawes Exp $ */ /* $XConsortium: iplcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c index c77db6b63..50e4a81ab 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */ +/* $XFree86$ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 512c48048..7af2fa4fa 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.0 1996/08/18 01:54:42 dawes Exp $ */ /* * Fill rectangles. */ diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 010f911f6..767db30cb 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */ +/* $XFree86$ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 794a62609..8a69cb7c8 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.0 1996/08/18 01:54:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 271656bda..8ae61b6cc 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c index 6374e4d19..1bcb57d57 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 0522309b4..6c8e9ab73 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index 479bfb00a..f59638693 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.0 1996/08/18 01:54:50 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h index 2e0a2b3cc..b188ec3ec 100644 --- a/iplan2p4/iplmap.h +++ b/iplan2p4/iplmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.1 1998/04/05 16:42:26 robin Exp $ */ /* * $XConsortium: iplmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $ * diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h index fa537d3a7..22f3b4d5f 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */ #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c index 9f1d37dfb..d408b804e 100644 --- a/iplan2p4/iplmskbits.c +++ b/iplan2p4/iplmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.c,v 3.0 1996/08/18 01:54:54 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ #include "iplmap.h" diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h index 4fb3fe066..51bb26393 100644 --- a/iplan2p4/iplmskbits.h +++ b/iplan2p4/iplmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.h,v 3.0 1996/08/18 01:54:55 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpack.c b/iplan2p4/iplpack.c index 96072895c..a6ca6f12b 100644 --- a/iplan2p4/iplpack.c +++ b/iplan2p4/iplpack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.c,v 3.0 1996/08/18 01:54:56 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpack.h b/iplan2p4/iplpack.h index 9545c75ec..53c2c988f 100644 --- a/iplan2p4/iplpack.h +++ b/iplan2p4/iplpack.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.h,v 3.0 1996/08/18 01:54:57 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c index 212f94979..7800e8d96 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.0 1996/08/18 01:54:59 dawes Exp $ */ /* $XConsortium: iplpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c index f73bc8864..fc73f2065 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.0 1996/08/18 01:55:00 dawes Exp $ */ /* * $XConsortium: iplply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $ * diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c index a5a61194a..88dbad6bf 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c index 3d90edea4..763733a04 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.0 1996/08/18 01:55:02 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index cfc43c130..75ec557ee 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */ +/* $XFree86$ */ /* * $XConsortium: iplrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $ * diff --git a/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h index d14d1a54b..31e7b79b1 100644 --- a/iplan2p4/iplrrop.h +++ b/iplan2p4/iplrrop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.0 1996/08/18 01:55:04 dawes Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c index 1d7915776..00dbef074 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.2 1998/06/27 12:55:03 hohndel Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 0533eed71..52eefc31d 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c index 2f741ed7f..447193b27 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.0 1996/08/18 01:55:08 dawes Exp $ */ /* * $XConsortium: iplsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $ * diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c index 4d82a655a..8414bc7b2 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ipltegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c index ea608effb..6774de834 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.0 1996/08/18 01:55:10 dawes Exp $ */ /* * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c index a63ce5da6..abd4a3021 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */ +/* $XFree86$ */ /* * Fill odd tiled rectangles and spans. * no depth dependencies. diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index 39d1eff9b..8d95e284b 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.0tsi Exp $ */ /* $XConsortium: iplwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */ /*********************************************************** diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c index 25ef34426..b1366aa3f 100644 --- a/lbx/lbxcmap.c +++ b/lbx/lbxcmap.c @@ -25,7 +25,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/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index 5a40614f6..c392e6415 100644 --- a/lbx/lbxdix.c +++ b/lbx/lbxdix.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.7 2001/08/23 14:46:57 alanh Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index d611a7f2c..7ae70ebde 100644 --- a/lbx/lbxexts.c +++ b/lbx/lbxexts.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index 6eb7af197..5a468ecbf 100644 --- a/lbx/lbxgfx.c +++ b/lbx/lbxgfx.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.3 2001/01/17 22:36:59 dawes Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index 1a82ce3b3..443bb0414 100644 --- a/lbx/lbxmain.c +++ b/lbx/lbxmain.c @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index 461f0d778..fdef2db7c 100644 --- a/lbx/lbxopts.c +++ b/lbx/lbxopts.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */ #ifdef OPTDEBUG #include <stdio.h> diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index e9a6d8a8e..9082250d6 100644 --- a/lbx/lbxprop.c +++ b/lbx/lbxprop.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.4 2001/05/15 10:19:43 eich Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h index 40a2ff0ae..eeff64804 100644 --- a/lbx/lbxserve.h +++ b/lbx/lbxserve.h @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */ #ifndef _LBXSERVE_H_ diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index d71647091..f3dc13163 100644 --- a/lbx/lbxsquish.c +++ b/lbx/lbxsquish.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include "X.h" diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h index eeb94f266..ea7f2420e 100644 --- a/lbx/lbxsrvopts.h +++ b/lbx/lbxsrvopts.h @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index edfc0bea7..23fdd30f7 100644 --- a/lbx/lbxswap.c +++ b/lbx/lbxswap.c @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c index e071846e3..26a635f6f 100644 --- a/lbx/lbxtables.c +++ b/lbx/lbxtables.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #include "dix.h" extern int ProcInitialConnection(ClientPtr client); diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 5b1d65a4a..6fdc4d5a2 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h index e451ad091..376a4cc27 100644 --- a/lbx/lbxtags.h +++ b/lbx/lbxtags.h @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c index 50b424708..20d58b37b 100644 --- a/lbx/lbxzerorep.c +++ b/lbx/lbxzerorep.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ /* * This module handles zeroing out unused pad bytes in core X replies. diff --git a/mfb/fastblt.h b/mfb/fastblt.h index f647eb6ba..f25541f55 100644 --- a/mfb/fastblt.h +++ b/mfb/fastblt.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.4 2001/01/17 22:37:01 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing diff --git a/mfb/maskbits.c b/mfb/maskbits.c index 4f3e0087b..09f593ec2 100644 --- a/mfb/maskbits.c +++ b/mfb/maskbits.c @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ #include "maskbits.h" #include "servermd.h" diff --git a/mfb/maskbits.h b/mfb/maskbits.h index 711731660..4cd30be39 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.8tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/mfb/mergerop.h b/mfb/mergerop.h index ee3a33fe9..e54e1f906 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -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/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ #ifndef _MERGEROP_H_ #define _MERGEROP_H_ diff --git a/mfb/mfb.h b/mfb/mfb.h index 01e09f195..267ebc4ea 100644 --- a/mfb/mfb.h +++ b/mfb/mfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.21 2003/07/16 03:35:16 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 310d492f8..6e950e837 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.7tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index 59968110b..ca240ba99 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -1,7 +1,7 @@ /* * mfb copy area */ -/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.3 2001/10/28 03:34:14 tsi Exp $ */ /* diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index d43bd2e00..b1fad2192 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -1,5 +1,5 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ -/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index 182744d6e..a7ffdc36c 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index d23071cd3..3b36819ef 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index d5dfbf47f..253399df4 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.7tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 886c2852a..9e65d8340 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index cd1b66845..aa90f411b 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 5a095757f..8fd4c0f29 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 1119f66f9..aec4c2e7f 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.9 2003/07/16 01:38:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index 59bd7e538..b63a184f8 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 237e337f5..626ef67fb 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 4d616ed8b..1fb40db5a 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 066ca3ce7..aa948a34e 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbline.c b/mfb/mfbline.c index e7e678983..b8e1d3648 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 980e57246..f3f8decc7 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ #include "X.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 61a7297f0..5e4a619be 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index 38cd4aee8..5c99d03de 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index f10e39046..0410af192 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.6tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 28b0c24c3..12ccf6079 100644 --- a/mfb/mfbscrclse.c +++ b/mfb/mfbscrclse.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */ #include "mfb.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index d07aadb80..c85d4e36b 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.8tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index a56935dbe..66da37d1d 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.6tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index 1e0da0f02..b0e02850c 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index e672f38c9..50b261114 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index f7ff963c4..294083f78 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "scrnintstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 1ef9f1f56..ad46732ab 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/cbrt.c b/mi/cbrt.c index 44c836e43..cfc8d84da 100644 --- a/mi/cbrt.c +++ b/mi/cbrt.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.3 2001/05/29 22:24:06 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ diff --git a/mi/mi.h b/mi/mi.h index fba57567d..388a90b27 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/mi/miarc.c b/mi/miarc.c index 832a056c3..9f2c8c15c 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.4.2.2 2004/03/04 20:17:04 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** @@ -49,7 +50,8 @@ SOFTWARE. /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) +#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ + || (defined(sun) && defined(__SVR4)) #include <math.h> #else #define _XOPEN_SOURCE /* to get prototype for hypot on some systems */ @@ -1702,6 +1704,8 @@ miGetArcPts( poly[cpt].x = (xc + x0); poly[cpt].y = (yc + y0); + poly[cpt + 1].x = (xc + x1); + poly[cpt + 1].y = (yc + y1); for(i = 2; i < count; i++) { diff --git a/mi/mibank.c b/mi/mibank.c index cc2796edb..1f1087b88 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -1,5 +1,5 @@ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/mi/mibank.h b/mi/mibank.h index c3aa69379..cf27d1fae 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -1,5 +1,5 @@ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/mi/mibitblt.c b/mi/mibitblt.c index f0228212c..82e34cdbe 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mibstore.c b/mi/mibstore.c index e04e5410c..1cd35c4dd 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -42,7 +42,7 @@ implied warranty. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/mi/mibstore.h b/mi/mibstore.h index e8f197dbc..fb58975c6 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -16,7 +16,7 @@ */ -/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index 249b4d4d3..fec3c9712 100644 --- a/mi/mibstorest.h +++ b/mi/mibstorest.h @@ -31,7 +31,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/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #include "mibstore.h" #include "regionstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index 95272c176..456ad08c4 100644 --- a/mi/miclipn.c +++ b/mi/miclipn.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/mi/micmap.c b/mi/micmap.c index b3e925a09..018244a2a 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.11 2001/05/29 22:24:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.10 2000/09/20 00:09:14 keithp Exp $ */ /* * This is based on cfbcmap.c. The functions here are useful independently diff --git a/mi/micmap.h b/mi/micmap.h index 557ae63d5..ca2a417be 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.7 2000/09/20 00:09:15 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ #include "colormapst.h" diff --git a/mi/micoord.h b/mi/micoord.h index ffe2e1e53..420766916 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -50,7 +50,7 @@ defined(__i386__) || defined(i386) || \ defined(__ia64__) || defined(ia64) || \ defined(__s390x__) || defined(__s390__) || \ - defined(__AMD64__) || defined(AMD64) + defined(__amd64__) || defined(amd64) #define GetHighWord(x) (((int) (x)) >> 16) #else #define GetHighWord(x) (((int) (x)) / 65536) diff --git a/mi/micursor.c b/mi/micursor.c index 4c95d2f49..5da44c351 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midash.c b/mi/midash.c index bc33b0c20..0152db7ca 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midispcur.c b/mi/midispcur.c index ca85fc3d1..08c9f9216 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */ #define NEED_EVENTS # include "X.h" diff --git a/mi/mieq.c b/mi/mieq.c index 699d4130c..a0ed3fdce 100644 --- a/mi/mieq.c +++ b/mi/mieq.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/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.2 2001/05/25 18:41:01 dawes Exp $ */ /* * mieq.c diff --git a/mi/miexpose.c b/mi/miexpose.c index 07efa754c..f2f43f4e3 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.4.2.4 2004/03/08 00:36:57 alanc Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -44,6 +45,33 @@ 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. +******************************************************************/ +/***************************************************************** + +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. + ******************************************************************/ /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ diff --git a/mi/mifillarc.c b/mi/mifillarc.c index fa37d45be..c8b901c85 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ed8503f15..ff39bac1d 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillrct.c b/mi/mifillrct.c index be2c58dfe..31219869e 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 837cf7b20..79f606b4d 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 93999ea7d..ae41cf6f6 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/migc.c b/mi/migc.c index 29eec9749..b5b33852a 100644 --- a/mi/migc.c +++ b/mi/migc.c @@ -27,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/migc.h b/mi/migc.h index 8cb5a56c9..d906c6334 100644 --- a/mi/migc.h +++ b/mi/migc.h @@ -27,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.8 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.7 2001/08/06 20:51:18 dawes Exp $ */ extern void miChangeGC( GCPtr /*pGC*/, diff --git a/mi/miglblt.c b/mi/miglblt.c index 3e7e5da1b..f2a748db6 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miinitext.c b/mi/miinitext.c index ee63aa41b..4ec997aec 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.3.2.3 2004/03/04 20:17:04 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miline.h b/mi/miline.h index 8977550b3..f52a51ebd 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -25,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/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MILINE_H diff --git a/mi/mioverlay.c b/mi/mioverlay.c index cdb2058b1..74cd18022 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 6098f9c39..64045f45c 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.4 2001/04/14 21:15:26 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ #ifndef __MIOVERLAY_H #define __MIOVERLAY_H diff --git a/mi/mipointer.c b/mi/mipointer.c index 58d93b80b..2e4ee607b 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */ # define NEED_EVENTS # include "X.h" diff --git a/mi/mipointer.h b/mi/mipointer.h index 0486fc5a3..f8e7fd084 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index ab5372229..682f8ac88 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index ad69d7062..2c420b250 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipoly.h b/mi/mipoly.h index 42d973477..88a1782de 100644 --- a/mi/mipoly.h +++ b/mi/mipoly.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /* diff --git a/mi/mipolycon.c b/mi/mipolycon.c index d99ed83d7..de33045ef 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolygen.c b/mi/mipolygen.c index bbeb05dc3..484a29798 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index ed19f5f68..f88545cfd 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 298ba2385..07964cf82 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index cb6bb7550..fe4993914 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolytext.c b/mi/mipolytext.c index 9084fe180..a3f64a086 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index 7ffeadd86..9a7422223 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.9 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 0c8d32ae6..019ba437e 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miregion.c b/mi/miregion.c index ef666c321..2057deb62 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.9 2003/04/23 21:51:53 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group @@ -49,26 +49,33 @@ SOFTWARE. /* $Xorg: miregion.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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. * -* * -*****************************************************************/ +/***************************************************************** + +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. + +******************************************************************/ #include "regionstr.h" #include "Xprotostr.h" diff --git a/mi/miscrinit.c b/mi/miscrinit.c index edb5f7d78..7f8ee48ad 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ #include "X.h" #include "servermd.h" diff --git a/mi/mispans.c b/mi/mispans.c index 81fa45da7..84a737525 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/mispans.h b/mi/mispans.h index 5ae2d014a..b6e97e2b4 100644 --- a/mi/mispans.h +++ b/mi/mispans.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/misprite.c b/mi/misprite.c index d323f1168..260a4dac0 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */ # include "X.h" # include "Xproto.h" diff --git a/mi/misprite.h b/mi/misprite.h index a7e19f7cb..b4cc84ecf 100644 --- a/mi/misprite.h +++ b/mi/misprite.h @@ -32,7 +32,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( diff --git a/mi/mispritest.h b/mi/mispritest.h index eddc16c2d..e438dd7d2 100644 --- a/mi/mispritest.h +++ b/mi/mispritest.h @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall 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/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ # include "misprite.h" #ifdef RENDER diff --git a/mi/mistruct.h b/mi/mistruct.h index 0744b2593..98879b72d 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index c1ef15bb1..c25e5d5bc 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef MIVALIDATE_H diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 90ba5d98e..8cd511240 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -1,4 +1,5 @@ /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.1.4.2.6.2 2004/03/08 00:36:57 alanc Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function @@ -52,28 +53,35 @@ in this Software without prior written authorization from The Open Group. ******************************************************************/ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +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/mi/mivaltree.c,v 1.9tsi Exp $ */ /* * Aug '86: Susan Angebranndt -- original code diff --git a/mi/miwideline.c b/mi/miwideline.c index 84b4346f2..8888ca8bd 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwideline.h b/mi/miwideline.h index f32a1e8fe..96d6aae86 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.11 2001/10/25 12:03:47 alanh Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 9c962ee4e..4eac9226c 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerarc.c b/mi/mizerarc.c index e2233e78e..e36b2f3f0 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerarc.h b/mi/mizerarc.h index 4a52efa29..99062d192 100644 --- a/mi/mizerarc.h +++ b/mi/mizerarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerclip.c b/mi/mizerclip.c index fa1863b54..304f525ae 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerline.c b/mi/mizerline.c index d1fbf631e..4672f6bd3 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/miext/layer/layer.h b/miext/layer/layer.h index 630438057..09ab43540 100644 --- a/miext/layer/layer.h +++ b/miext/layer/layer.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.5 2002/10/03 22:50:21 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c index 52490d286..d01787b10 100644 --- a/miext/layer/layergc.c +++ b/miext/layer/layergc.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.5 2001/10/28 03:34:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.4 2001/08/27 03:55:46 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index 6cbca7150..4e49c9b15 100644 --- a/miext/layer/layerinit.c +++ b/miext/layer/layerinit.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.6tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index ef412a2c5..eb3fec897 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $ + * $XFree86$ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 401dfd96f..8dcba062d 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.2 2001/06/04 09:45:41 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 44a5df24c..177df4e35 100644 --- a/miext/layer/layerwin.c +++ b/miext/layer/layerwin.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.7tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h index 56afd7331..dab0c6f46 100644 --- a/miext/rootless/accel/rlAccel.h +++ b/miext/rootless/accel/rlAccel.h @@ -26,7 +26,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/miext/rootless/accel/rlAccel.h,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ /* * rlBlt.c diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index ba6fdf227..6711c500e 100644 --- a/miext/rootless/accel/rlBlt.c +++ b/miext/rootless/accel/rlBlt.c @@ -26,7 +26,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlBlt.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index cbd58b4cf..8e063a347 100644 --- a/miext/rootless/accel/rlCopy.c +++ b/miext/rootless/accel/rlCopy.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlCopy.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index 7fd7adfa8..e33b40d45 100644 --- a/miext/rootless/accel/rlFill.c +++ b/miext/rootless/accel/rlFill.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFill.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index 2ce9eae2b..ca3985298 100644 --- a/miext/rootless/accel/rlFillRect.c +++ b/miext/rootless/accel/rlFillRect.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillRect.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index fd5ee35f5..b91f734c1 100644 --- a/miext/rootless/accel/rlFillSpans.c +++ b/miext/rootless/accel/rlFillSpans.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillSpans.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index 2bf2da64b..da28204eb 100644 --- a/miext/rootless/accel/rlGlyph.c +++ b/miext/rootless/accel/rlGlyph.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ #include "fb.h" #include "fontstruct.h" diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index e2249569b..4ff4798c1 100644 --- a/miext/rootless/accel/rlSolid.c +++ b/miext/rootless/accel/rlSolid.c @@ -26,7 +26,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlSolid.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index 2b375706f..aefefcab2 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -27,7 +27,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/miext/rootless/rootless.h,v 1.6 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.5 2003/10/18 00:00:34 torrey Exp $ */ #ifndef _ROOTLESS_H #define _ROOTLESS_H diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index bc6259ea6..85655a9e1 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -28,7 +28,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/miext/rootless/rootlessCommon.c,v 1.5 2003/11/10 18:22:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4tsi Exp $ */ #include "rootlessCommon.h" diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index 973ec6291..c75c45a2e 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -27,7 +27,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/miext/rootless/rootlessCommon.h,v 1.4 2003/09/16 00:36:20 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 5b20db8a8..1ee872ad8 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -26,7 +26,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/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index 8c70135a1..b370d2beb 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -28,7 +28,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/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #include "mi.h" #include "scrnintstr.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index beb737df1..21c62c4ef 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -28,7 +28,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/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */ #include "mi.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index a95917939..7b0337bce 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -3,7 +3,7 @@ * * This file is very closely based on mivaltree.c. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.1tsi Exp $ */ /* * mivaltree.c -- @@ -54,26 +54,33 @@ in this Software without prior written authorization from The Open Group. ******************************************************************/ /* The panoramix components contained the following notice */ -/**************************************************************** -* * -* 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. * -* * -*****************************************************************/ +/***************************************************************** + +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. + +******************************************************************/ /* * Aug '86: Susan Angebranndt -- original code diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index ac0f9f0b1..ddd0d1891 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.1.4.1.4.1 2004/03/04 17:48:29 eich Exp $ */ /* * Rootless window management */ @@ -1042,7 +1043,6 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY, { ScreenPtr pScreen = pWin->drawable.pScreen; RootlessWindowRec *winRec = WINREC(pWin); - BoxRec box; int i; RootlessStopDrawing(pWin, FALSE); @@ -1065,12 +1065,7 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY, /* Redraw everything. FIXME: there must be times when we don't need to do this. Perhaps when top-left weighting and no gravity? */ - box.x1 = 0; - box.y1 = 0; - box.x2 = winRec->width; - box.y2 = winRec->height; - - RootlessDamageBox(pWin, &box); + RootlessDamageRect(pWin, -newBW, -newBW, newW, newH); for (i = 0; i < 2; i++) { if (gResizeDeathPix[i] != NULL) { diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index f6736f544..6c26bace3 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -26,7 +26,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/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h index 440a5ecc9..63922aeec 100644 --- a/miext/rootless/safeAlpha/safeAlpha.h +++ b/miext/rootless/safeAlpha/safeAlpha.h @@ -32,7 +32,6 @@ #define _SAFEALPHA_H #include "picturestr.h" -#include "rootlessCommon.h" void SafeAlphaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what); diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c index ad9360c7e..a10e7456c 100644 --- a/miext/rootless/safeAlpha/safeAlphaPicture.c +++ b/miext/rootless/safeAlpha/safeAlphaPicture.c @@ -41,6 +41,7 @@ #include "mipict.h" #include "fbpict.h" #include "safeAlpha.h" +#include "rootlessCommon.h" # define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 2c3761875..1c6a8a747 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.2.2.2 2004/03/04 17:48:30 eich Exp $ */ /* * Specialized window functions to protect the alpha channel */ @@ -35,6 +36,7 @@ #include "fb.h" #include "safeAlpha.h" +#include "rootlessCommon.h" #ifdef PANORAMIX #include "panoramiX.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 38a92953f..260c840a5 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.14tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index d8ade93dc..d343a171f 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.6tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 028ec26a5..9edd8338e 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 818a37a8e..441409776 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.4 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 148782956..aaa6d58eb 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index c82b5f931..3d4a3724d 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index a1ff273de..16b146352 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index 7ba41833e..3786444d4 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index 0b3c4e0ac..d2c9271f4 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 574b3a157..36cf94489 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 327636efb..3ef791608 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 838622267..943d6485e 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index b0dd28316..0038c624c 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 9bdb18e25..1183ba65a 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 7af181f19..885c5e9a2 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 316c0c690..7bdb2a932 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index bed542f6d..483f05f79 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index f2618fc47..8c93d21ed 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 1277c2ee1..a0f5b6e06 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.4tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index ce9b4c561..507cabb56 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/os/WaitFor.c b/os/WaitFor.c index 221296d11..3283dd5cf 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.43 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -604,7 +604,8 @@ DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSStandbyTime - timeout; } if (DPMSPowerLevel < DPMSModeStandby) { - DPMSSet(DPMSModeStandby); + if (DPMSEnabled) + DPMSSet(DPMSModeStandby); } return DPMSStandbyTime; } @@ -618,7 +619,8 @@ DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSSuspendTime - timeout; } if (DPMSPowerLevel < DPMSModeSuspend) { - DPMSSet(DPMSModeSuspend); + if (DPMSEnabled) + DPMSSet(DPMSModeSuspend); } return DPMSSuspendTime; } @@ -632,7 +634,8 @@ DPMSOffTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSOffTime - timeout; } if (DPMSPowerLevel < DPMSModeOff) { - DPMSSet(DPMSModeOff); + if (DPMSEnabled) + DPMSSet(DPMSModeOff); } return DPMSOffTime; } diff --git a/os/access.c b/os/access.c index 6ceb91216..304dc33bb 100644 --- a/os/access.c +++ b/os/access.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.50 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */ #ifdef WIN32 #include <X11/Xwinsock.h> @@ -659,6 +659,20 @@ DefineLocalHost: #include <arpa/inet.h> #endif +#if defined(IPv6) && defined(AF_INET6) +static void +in6_fillscopeid(struct sockaddr_in6 *sin6) +{ +#if defined(__KAME__) + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { + sin6->sin6_scope_id = + ntohs(*(u_int16_t *)&sin6->sin6_addr.s6_addr[2]); + sin6->sin6_addr.s6_addr[2] = sin6->sin6_addr.s6_addr[3] = 0; + } +#endif +} +#endif + void DefineSelf (int fd) { @@ -775,6 +789,10 @@ DefineSelf (int fd) #endif /* DNETCONN */ if (family == -1 || family == FamilyLocal) continue; +#if defined(IPv6) && defined(AF_INET6) + if (family == FamilyInternet6) + in6_fillscopeid((struct sockaddr_in6 *)&IFR_IFR_ADDR); +#endif #ifdef DEF_SELF_DEBUG if (family == FamilyInternet) ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %d.%d.%d.%d\n", @@ -922,10 +940,24 @@ DefineSelf (int fd) family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr); if (family == -1 || family == FamilyLocal) continue; +#if defined(IPv6) && defined(AF_INET6) + if (family == FamilyInternet6) + in6_fillscopeid((struct sockaddr_in6 *)ifr->ifa_addr); +#endif + #ifdef DEF_SELF_DEBUG if (family == FamilyInternet) ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %d.%d.%d.%d\n", ifr->ifa_name, addr[0], addr[1], addr[2], addr[3]); +#if defined(IPv6) && defined(AF_INET6) + else if (family == FamilyInternet6) { + char cp[INET6_ADDRSTRLEN]; + + inet_ntop(AF_INET6, addr, cp, sizeof(cp)); + ErrorF("Xserver: DefineSelf(): ifname = %s addr = %s\n", + ifr->ifa_name, cp); + } +#endif #endif /* DEF_SELF_DEBUG */ for (host = selfhosts; host != NULL && !addrEqual(family, addr, len, host); @@ -947,14 +979,21 @@ DefineSelf (int fd) /* * If this isn't an Internet Address, don't register it. */ - if (family != FamilyInternet) + if (family != FamilyInternet +#if defined(IPv6) && defined(AF_INET6) + && family != FamilyInternet6 +#endif + ) continue; /* - * Ignore 'localhost' entries as they're not usefule - * on the other end of the wire. + * ignore 'localhost' entries as they're not useful + * on the other end of the wire */ - if (len == 4 && + if (ifr->ifa_flags & IFF_LOOPBACK) + continue; + + if (family == FamilyInternet && addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1) continue; @@ -968,8 +1007,17 @@ DefineSelf (int fd) addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] == 0) continue; - +#if defined(IPv6) && defined(AF_INET6) + else if (family == FamilyInternet6 && + IN6_IS_ADDR_LOOPBACK((struct in6_addr *)addr)) + continue; +#endif XdmcpRegisterConnection(family, (char *)addr, len); +#if defined(IPv6) && defined(AF_INET6) + if (family == FamilyInternet6) + /* IPv6 doesn't support broadcasting, so we drop out here */ + continue; +#endif if ((ifr->ifa_flags & IFF_BROADCAST) && (ifr->ifa_flags & IFF_UP)) broad_addr = *ifr->ifa_broadaddr; diff --git a/os/auth.c b/os/auth.c index a1cbc8c1f..40f34ffff 100644 --- a/os/auth.c +++ b/os/auth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */ +/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */ /* * authorization hooks for the server diff --git a/os/connection.c b/os/connection.c index 7465e7eff..40c80d342 100644 --- a/os/connection.c +++ b/os/connection.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.65 2003/10/30 21:21:10 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.64 2003/10/07 22:50:42 herrb Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * diff --git a/os/io.c b/os/io.c index cf8a0343e..956a53300 100644 --- a/os/io.c +++ b/os/io.c @@ -53,7 +53,7 @@ SOFTWARE. * InsertFakeRequest, ResetCurrentRequest * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/os/io.c,v 3.35 2003/04/27 21:31:08 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */ #if 0 #define DEBUG_COMMUNICATION diff --git a/os/k5auth.c b/os/k5auth.c index 8c59fe8ab..3726df6ba 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */ /* * Kerberos V5 authentication scheme diff --git a/os/lbxio.c b/os/lbxio.c index ae4d4355f..ba79040b5 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/os/mitauth.c b/os/mitauth.c index bddbdf1d6..97f88b232 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.4 2001/01/17 22:37:11 dawes Exp $ */ /* * MIT-MAGIC-COOKIE-1 authorization scheme diff --git a/os/oscolor.c b/os/oscolor.c index f6e941fb8..557d539bb 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osdep.h b/os/osdep.h index a5392ffc3..2b9eb5674 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osinit.c b/os/osinit.c index 1c56d0af7..1a5ff0501 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.30 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/rpcauth.c b/os/rpcauth.c index 512b3ecb5..f0693f599 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.7 2001/12/14 20:00:35 dawes Exp $ */ /* * SUN-DES-1 authentication mechanism diff --git a/os/secauth.c b/os/secauth.c index 4f90fe9a9..8c30eaafb 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -24,7 +24,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/os/secauth.c,v 1.11 2001/12/14 20:00:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ #include "X.h" #include "os.h" diff --git a/os/strlcat.c b/os/strlcat.c index cda5c6ab9..7031de3a6 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86$ */ #include <sys/types.h> diff --git a/os/strlcpy.c b/os/strlcpy.c index 14e45ef8c..71657da69 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86$ */ #include <sys/types.h> #include <string.h> diff --git a/os/utils.c b/os/utils.c index 0984a7a6f..fdd45f73d 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.6.2.4 2004/03/04 17:48:31 eich Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -49,7 +50,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.95 2003/10/01 18:36:38 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */ #ifdef __CYGWIN__ #include <stdlib.h> @@ -244,6 +245,7 @@ LockServer(void) int lfd, i, haslock, l_pid, t; char *tmppath = NULL; int len; + char port[20]; if (nolock) return; /* @@ -258,13 +260,14 @@ LockServer(void) FatalError("No TMP dir found\n"); #endif + sprintf(port, "%d", atoi(display)); len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : strlen(LOCK_TMP_PREFIX); - len += strlen(tmppath) + strlen(display) + strlen(LOCK_SUFFIX) + 1; + len += strlen(tmppath) + strlen(port) + strlen(LOCK_SUFFIX) + 1; if (len > sizeof(LockFile)) - FatalError("Display name `%s' is too long\n", display); - (void)sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, display); - (void)sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, display); + FatalError("Display name `%s' is too long\n", port); + (void)sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, port); + (void)sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, port); /* * Create a temporary file containing our PID. Attempt three times @@ -359,7 +362,7 @@ LockServer(void) */ unlink(tmp); FatalError("Server is already active for display %s\n%s %s\n%s\n", - display, "\tIf this server is no longer running, remove", + port, "\tIf this server is no longer running, remove", LockFile, "\tand start again."); } } @@ -584,8 +587,10 @@ ProcessCommandLine(int argc, char *argv[]) defaultKeyboardControl.autoRepeat = TRUE; -#ifdef PART_NET - PartialNetwork = TRUE; +#ifdef NO_PART_NET + PartialNetwork = FALSE; +#else + PartialNetwork = TRUE; #endif for ( i = 1; i < argc; i++ ) @@ -1844,13 +1849,13 @@ enum BadCode { #define ARGMSG \ "\nIf the arguments used are valid, and have been rejected incorrectly\n" \ "please send details of the arguments and why they are valid to\n" \ - "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \ + "&&&&&@X.org. In the meantime, you can start the Xserver as\n" \ "the \"super user\" (root).\n" #define ENVMSG \ "\nIf the environment is valid, and have been rejected incorrectly\n" \ "please send details of the environment and why it is valid to\n" \ - "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \ + "&&&&&@X.org. In the meantime, you can start the Xserver as\n" \ "the \"super user\" (root).\n" void diff --git a/os/xalloc.c b/os/xalloc.c index 8bb46e2c9..5677896dc 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Pascal Haible. */ -/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.36 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.35tsi Exp $ */ /* Only used if INTERNAL_MALLOC is defined * - otherwise xalloc() in utils.c is used @@ -184,7 +184,7 @@ extern Bool Must_have_memory; defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(__AMD64__) || defined(AMD64) || \ + defined(__amd64__) || defined(amd64) || \ (defined(sgi) && _MIPS_SZLONG == 64)) #define MAGIC 0x1404196414071968 #define MAGIC_FREE 0x1506196615061966 diff --git a/os/xdmauth.c b/os/xdmauth.c index 13695c13c..4ec7265dd 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.9 2003/06/24 15:44:48 eich Exp $ */ +/* $XFree86: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and diff --git a/os/xdmcp.c b/os/xdmcp.c index 020d03d0b..e46073ca7 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.1.4.5.2.2 2004/03/04 17:48:31 eich Exp $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. @@ -13,7 +14,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.28 2003/11/11 00:27:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ #ifdef WIN32 /* avoid conflicting definitions */ @@ -754,14 +755,6 @@ XdmcpSelectHost( int host_len, ARRAY8Ptr AuthenticationName) { -#if defined(IPv6) && defined(AF_INET6) - /* Don't need list of addresses for host anymore */ - if (mgrAddrFirst != NULL) { - freeaddrinfo(mgrAddrFirst); - mgrAddrFirst = NULL; - mgrAddr = NULL; - } -#endif state = XDM_START_CONNECTION; memmove(&req_sockaddr, host_sockaddr, host_len); req_socklen = host_len; @@ -1156,7 +1149,7 @@ send_query_msg(void) socketfd = xdmcpSocket6; #endif XdmcpFlush (socketfd, &buffer, (XdmcpNetaddr) &ManagerAddress, - sizeof (ManagerAddress)); + ManagerAddressLen); } } @@ -1208,9 +1201,19 @@ send_request_msg(void) XdmcpHeader header; int length; int i; + CARD16 XdmcpConnectionType; ARRAY8 authenticationData; int socketfd = xdmcpSocket; + switch (SOCKADDR_FAMILY(ManagerAddress)) + { + case AF_INET: XdmcpConnectionType=FamilyInternet; break; +#if defined(IPv6) && defined(AF_INET6) + case AF_INET6: XdmcpConnectionType=FamilyInternet6; break; +#endif + default: XdmcpConnectionType=0xffff; break; + } + header.version = XDM_PROTOCOL_VERSION; header.opcode = (CARD16) REQUEST; @@ -1241,8 +1244,27 @@ send_request_msg(void) return; } XdmcpWriteCARD16 (&buffer, DisplayNumber); - XdmcpWriteARRAY16 (&buffer, &ConnectionTypes); - XdmcpWriteARRAYofARRAY8 (&buffer, &ConnectionAddresses); + XdmcpWriteCARD8 (&buffer, ConnectionTypes.length); + + /* The connection array is send reordered, so that connections of */ + /* the same address type as the XDMCP manager connection are send */ + /* first. This works around a bug in xdm. mario@klebsch.de */ + for (i = 0; i < (int)ConnectionTypes.length; i++) + if (ConnectionTypes.data[i]==XdmcpConnectionType) + XdmcpWriteCARD16 (&buffer, ConnectionTypes.data[i]); + for (i = 0; i < (int)ConnectionTypes.length; i++) + if (ConnectionTypes.data[i]!=XdmcpConnectionType) + XdmcpWriteCARD16 (&buffer, ConnectionTypes.data[i]); + + XdmcpWriteCARD8 (&buffer, ConnectionAddresses.length); + for (i = 0; i < (int)ConnectionAddresses.length; i++) + if ( (i<ConnectionTypes.length) && + (ConnectionTypes.data[i]==XdmcpConnectionType) ) + XdmcpWriteARRAY8 (&buffer, &ConnectionAddresses.data[i]); + for (i = 0; i < (int)ConnectionAddresses.length; i++) + if ( (i>=ConnectionTypes.length) || + (ConnectionTypes.data[i]!=XdmcpConnectionType) ) + XdmcpWriteARRAY8 (&buffer, &ConnectionAddresses.data[i]); XdmcpWriteARRAY8 (&buffer, AuthenticationName); XdmcpWriteARRAY8 (&buffer, &authenticationData); @@ -1595,7 +1617,7 @@ get_mcast_options(argc, argv, i) int argc, i; char **argv; { - char *address = "ff02::1"; /* Default address until IANA assigns one */ + char *address = XDM_DEFAULT_MCAST_ADDR6; int hopcount = 1; struct addrinfo hints; char portstr[6]; diff --git a/randr/mirandr.c b/randr/mirandr.c index b45a1f9a8..1dc173a96 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randr.c b/randr/randr.c index c0a8c4bf8..b253ddbab 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randrstr.h b/randr/randrstr.h index d966cd5b7..48213185c 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * diff --git a/record/record.c b/record/record.c index 3657ef42b..85c74d1f3 100644 --- a/record/record.c +++ b/record/record.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.1.4.4.2.2 2004/03/04 17:48:44 eich Exp $ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -32,7 +33,7 @@ This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */ #define NEED_EVENTS #include "dixstruct.h" diff --git a/record/set.c b/record/set.c index 847a1b28d..341516664 100644 --- a/record/set.c +++ b/record/set.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */ /* diff --git a/record/set.h b/record/set.h index 169077720..6f0b872a1 100644 --- a/record/set.h +++ b/record/set.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86$ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension diff --git a/render/animcur.c b/render/animcur.c index fcf6a25a7..b00cdf682 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.5tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/filter.c b/render/filter.c index a2f7563cb..4435197e2 100644 --- a/render/filter.c +++ b/render/filter.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $ + * $XFree86$ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/glyph.c b/render/glyph.c index b4f08c223..5dd700581 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.6 2001/10/28 03:34:19 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.5 2001/01/30 07:01:22 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/glyphstr.h b/render/glyphstr.h index 99f55e3eb..68d6f2085 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.4 2001/01/21 21:19:39 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miglyph.c b/render/miglyph.c index 00b6764d6..8d0c2079b 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.4 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miindex.c b/render/miindex.c index 739348273..aff610940 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.8 2002/11/06 22:45:36 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.7 2002/11/05 06:05:04 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mipict.c b/render/mipict.c index 0f0cf6c8b..ed97acc7b 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.16 2003/11/10 18:22:52 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.15tsi Exp $ * * Copyright © 1999 Keith Packard * diff --git a/render/mipict.h b/render/mipict.h index 0154fb5f0..4af4c56be 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.13 2002/11/06 22:45:36 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.12 2002/11/05 05:34:40 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/mirect.c b/render/mirect.c index 33c7a9f14..63e9c7cc4 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.4 2001/06/08 19:36:34 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.3 2000/12/08 07:52:05 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitrap.c b/render/mitrap.c index 7f592ccd4..05db36ec8 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.9 2002/11/05 23:39:16 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitri.c b/render/mitri.c index fc706f117..b0526256d 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.5 2002/05/31 16:48:52 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/picture.c b/render/picture.c index b2ef69bdf..ad746b277 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.c,v 1.30 2003/01/26 16:40:43 eich Exp $ + * $XFree86: xc/programs/Xserver/render/picture.c,v 1.29 2002/11/23 02:38:15 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picture.h b/render/picture.h index c47d51941..b4e3bd27c 100644 --- a/render/picture.h +++ b/render/picture.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/picture.h,v 1.20tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -170,7 +170,7 @@ typedef __int64 xFixed_32_32; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(AMD64) || defined (__AMD64__) || \ + defined(amd64) || defined (__amd64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) typedef long xFixed_32_32; # else diff --git a/render/picturestr.h b/render/picturestr.h index cb5ea0ac9..ca766ce94 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -1,5 +1,6 @@ +/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.1.4.2.2.2 2004/03/04 17:48:45 eich Exp $ */ /* - * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/render.c b/render/render.c index 0d89885c3..b49f79fae 100644 --- a/render/render.c +++ b/render/render.c @@ -1,5 +1,6 @@ +/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.3.2.2 2004/03/04 17:48:45 eich Exp $ */ /* - * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * * Copyright © 2000 SuSE, Inc. * 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/ddxBeep.c b/xkb/ddxBeep.c index bb02619f3..6eee7e097 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.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/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index 2485488d2..c4a6ec7a0 100644 --- a/xkb/ddxConfig.c +++ b/xkb/ddxConfig.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/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.8 2002/12/20 20:18:35 paulo Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index c7c8f18b8..16c9f15b9 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.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/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index 5f5ebc9b4..0ce401adb 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.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/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 9f54cae6f..033aa18ea 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.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/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 289fa3bfb..56d81cf5e 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.1.4.5.2.2 2004/03/04 17:48:45 eich Exp $ */ /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +25,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index a8c436ea2..dea4ce607 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.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/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index afd028fcd..c0b2b8018 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.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/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 9ac7d3300..98744ed97 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.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/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index ab757c6fc..e7c484cab 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.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/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 5101de53b..30510ffaa 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.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/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 9f7704c5a..ed61becb0 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.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/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index dd7ef4630..852e2386f 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index ec43f79db..bbd0d1ac1 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.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/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/maprules.c b/xkb/maprules.c index c588ae399..330f9fe90 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkb.c b/xkb/xkb.c index 273385ef6..fcc156d35 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.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/programs/Xserver/xkb/xkb.c,v 3.22 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */ #include <stdio.h> #include "X.h" @@ -2307,8 +2307,7 @@ ProcXkbSetMap(ClientPtr client) stuff->maxKeyCode= xkb->max_key_code; } else { - if ((stuff->minKeyCode<XkbMinLegalKeyCode)|| - (stuff->maxKeyCode>XkbMaxLegalKeyCode)) { + if (!XkbIsLegalKeycode(stuff->minKeyCode)) { client->errorValue= _XkbErrCode3(2,stuff->minKeyCode, stuff->maxKeyCode); return BadValue; diff --git a/xkb/xkb.h b/xkb/xkb.h index 4eeb781db..704cd49c0 100644 --- a/xkb/xkb.h +++ b/xkb/xkb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/xkb/xkb.h,v 1.1 2003/07/16 01:39:08 dawes Exp $ */ +/* $XFree86$ */ /* #include "XKBfile.h" */ diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 096ebe2e4..5794e34ba 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.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/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */ #include <stdio.h> #include <math.h> diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 403c2fb89..0239c678a 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.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/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */ #include <stdio.h> #include <math.h> diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index 910616e60..7ea30bde2 100644 --- a/xkb/xkbDflts.h +++ b/xkb/xkbDflts.h @@ -1,5 +1,5 @@ /* $Xorg: xkbDflts.h,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.3 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ #ifndef DEFAULT_H diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 0cd1becac..7d2421a87 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.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/programs/Xserver/xkb/xkbEvents.c,v 3.12 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS 1 diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 064311d5e..b582845d9 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.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/programs/Xserver/xkb/xkbInit.c,v 3.32 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -716,7 +716,7 @@ XkbRF_VarDefsRec defs; if (ok && (finfo.xkb!=NULL)) { XkbDescPtr xkb; - int minKC,maxKC; + KeyCode minKC,maxKC; xkb= finfo.xkb; minKC= xkb->min_key_code; diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index f75db6918..26e6d87d3 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.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/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 3a9fc11f8..43288d3e9 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.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/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.9 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */ #include <stdio.h> #include <math.h> diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index 0a077f4c1..ec155645f 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.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/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <math.h> diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 6f4ffe8a9..4b6ba4ccc 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.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/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */ #include "stdio.h" #include "X.h" diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index f3ba6bc17..8b439c2a5 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.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/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c index 0e480b4df..34470ea77 100644 --- a/xkb/xkbconfig.c +++ b/xkb/xkbconfig.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index d12467ff7..351a8dac5 100644 --- a/xkb/xkberrs.c +++ b/xkb/xkberrs.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 2a6d836aa..1b83041ee 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkbout.c b/xkb/xkbout.c index d688aca01..3e81d64ef 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index fc593e796..027642af6 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xkb/xkmread.c b/xkb/xkmread.c index b7a08e267..cd38cbb32 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ #include <stdio.h>