This patch should be applied to an un-modified XFree86 version 4.0.2 source tree. It will convert the source tree to XFree86 version 4.0.3. To apply this patch, run the following from the directory containing your 'xc' directory: patch -p0 -E < 4.0.2-4.0.3.diff ------------------------------------------------------------------------------- Prereq: 4.0.2 Index: xc/programs/Xserver/hw/xfree86/CHANGELOG diff -u xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1485 xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1485.2.43 --- xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1485 Mon Dec 18 10:55:33 2000 +++ xc/programs/Xserver/hw/xfree86/CHANGELOG Fri Mar 16 11:44:42 2001 @@ -1,3 +1,136 @@ +XFree86 4.0.3 (16 March 2001) +1278. Fixes for Thai XIM support (#4479, Theppitak Karoonboonyanan). +1277. Fix XTRAP typo in miinitext.c (Damien Touraine). + +XFree86 4.0.2c (15 March 2001) +1276. Don't build support for loading the Matrox HAL module on platforms + other than ix86. This avoids some problems that show up on Alpha + platforms (Jay Estabrook). +1275. Alias memset and memcpy to xf86memset and xf86memcpy in the loader, + which should catch implicit compiler-generated calls to these functions + (David Dawes). +1274. Back out cirrus changes (item 1257) because they are incomplete. +1273. Fix the `make depend` scripts to honour -U flags and not require a blank + for -f flag (Marc La France). +1272. Update nv driver docs to indicate GeForce3 support (Mark Vojkovich). +1271. A new (perl) version of the mkhtmlindex script that works better than + the shell version (David Dawes). +1270. Major updates to the XFree86(1) man page (David Dawes). + +XFree86 4.0.2b (13 March 2001) +1269. Only enable Xv support for the 630 in the sis driver (#A.263, Nick Lamb). +1268. Modify the sis driver to prefer 24bpp framebuffer layout. Perhaps not + all support 32bpp? (#A.263, Nick Lamb). +1267. Add freetype2 build to stable branch (Keith Packard) +1266. Fix to xf8_16bpp to handle ChangeWindowAttributes() correctly + (Egbert Eich). +1265. Fixed Linux Alpha model mapping (Jay Estabrook). +1264. Added support for non-APECS Alphas requiring sparse mapping to + FreeBSD port (Egbert Eich). +1263. Moved options processing in VGA driver to handle vgaClocks option + correctly (Egbert Eich). +1262. Fixed DAC handling in tseng driver, removed last static variables + (Egbert Eich). +1261. Fixed resource registration in tdfx driver (Egbert Eich). +1260. Savage driver: Added MMIO unmap to PreInit() MMIO map to ScreenInit + (Egbert Eich). +1259. Fixed neomagic driver to keep server from core dumping on 2380 + chipsets (Egbert Eich). +1258. Modified handling of planemask register on G100 (Egbert Eich). +1257. Major update to cirrus driver: Adds DGA, fixes acceleration etc. + (Egbert Eich). +1256. Fix to C&T video driver to dislay colors correctly (Egbert Eich). +1255. Fix in C&T driver that prevents left half of the screen to be blank + (Egbert Eich). +1254. Fix to prevent server crashes on colormap changes after DGA mode + exits (Egbert Eich). +1253. Updates for Render+Xinerama support (Keith Packard) +1252. Updates for Hurd support (#A.324, Marcus Brinkmann). +1251. Fix core dump in XqueueMousePreInit (#A.317, Fiel Cabral). +1250. Fix a problem with the ThinkingMousePS/2 protocol handling of left + movement (#A.292, Ian Remmler). (This has been in 3.3.x since 3.3.4.) +1249. Don't try to mmap extra 64K blit window on older trident chips + (Alan Hourihane). +1248. Fix Xnest build problem with newest gcc compilers (Marc La France). +1247. Updates for console-related FreeBSD system header changes as of 4.1-REL + (FreeBSD ports patch-r, patch-s). +1246. Don't leave free'd vrotate uninitialised in lib/X11/omGeneric.c + (FreeBSD ports patch-q). +1245. Protect #define HasPam in FreeBSD.cf (FreeBSD ports patch-d). +1244. fix a problem with multi-thread support on OpenBSD (released OpenBSD + versions don't have getpwuid_r) (Matthieu Herrb) +1243. allow to compile on OpenBSD-current which has completly removed PCVT + from its installation. (Matthieu Herrb) +1242. Fix border garbage for the G400 second head by backing out #4205 + (David Dawes). +1241. Fix an Index/DAC register access conflict in glint pm2v, pm3 driver + (#A.319, Romain Dolbeau). + +XFree86 4.0.2a (28 February 2001) +1240. Make the stub files that pswrap generates contain the same set of + includes as the Adobe version, which fixes problems building + standalone DPS clients (#4487, Juliusz Chroboczek). +1239. Remove an incorrect ifdef in xterm's patch #141 which suppressed + overstriking to simulate bold font when xterm was compiled to support + wide characters (report/analysis by Adam M Costello + , fixes Debian bugs #76404, #77575) (#4494, + Thomas Dickey). +1238. Don't attempt to drive an mga G450 if the hal module isn't available + (#4465, David Woodhouse). +1237. Fix a typo in Xfbdev.man (#4446, Juliusz Chroboczek). +1236. Fix TrueType font problems in 4.0.2 (#4439, Juliusz Chroboczek). +1235. Document the "DisplaySize" keyword in the XF86Config man page (#4438, + Andrew C. Aitchison). +1234. Fix a bug in the fonts.sgml doc (#4432, Juliusz Chroboczek). +1233. Fix a twm segfault if it gets events for buttons > 5 (#4407, 4425, + Nathan Hand). +1232. Updates for Hurd support (#A.209, Marcus Brinkmann). +1231. Include in Xos.h to get struct tm (based on #4464, Mike Harris, + and H.J. Lu). +1230. Add missing Rage 128 PD chip support (Ishikawa Mutsumi). +1229. Work around compiler-generated call to memcpy in the sis driver + (David Dawes). +1228. Fix the neomagic driver so that it saves/restores the palette (#4452, + Ken Hornstein). +1227. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein). +1226. Add support for wsmouse protocol under OpenBSD/i386 (Matthieu Herrb). +1225. - +1224. Make acceleration work on the Trident Cyber9388 (Alan Hourihane). +1223. Make some changes to the clock selection for trident driver + (Alan Hourihane). +1222. Ensure Video is unavailable when no acceleration available in the + trident driver (Alan Hourihane). +1221. Allow xf86ClaimPciSlot to be called with a NULL GDevPtr, as it was + previously (Alan Hourihane). +1220. Correct some problems with xedit c-mode. Fix geometry management + incompatibilites with Xaw 6 in the Form widget. + Fix problem in libxf86config when comparing float and double and + small fix to xf86cfg when converting a HorizSync or VertRefresh + specification string to format used internally by libxf86config. + Adds dvorak keyboard and fixes Ukranian in rules/xfree86.lst. + Fix problems in the xkb interface of xf86cfg and fix autorepeat with + MouseKeys, based on patches and suggestion of Stephen Montgomery-Smith + (Paulo César Pereira de Andrade). +1219. Undo s3virge changes in 4.0.2 for Xv support on ViRGE chipsets since + they caused problems with plain ViRGE cards. Xv is still supported + for the ViRGE DX (#4414, 4430, Kevin Brosius). +1218. Fix incorrect driverName fields in the cyrix, i810 and sis drivers. + This was causing 'XFree86 -configure' to get the driver name wrong. + Also fix the documentation of this field in the DESIGN doc (David Dawes). +1217. [SECURITY] Fix temp files vulnerabilites in xman on systems with + mkstemp(). (Matthieu Herrb). +1216. [SECURITY] Fix temp vulnerabilities in Xaw/MultiSrc.c using the technique + in patch #4279 (Branden Robinson). Fix temp file vulnerability in + gccmakedep based on report from Alan Cox. Fix temp file vulnerability + in Imake.rules, InstallManPageAliases (Matthieu Herrb). +1215. Fix Neomagic 2200 screen corruption (Egbert Eich). +1214. Add an imake control for determining when xload should be installed + set-gid (David Dawes). +1213. Add some imake controls for installing Xkb and app-defaults files + in the traditional location rather than under /etc/X11 (Red Hat does + that) (David Dawes). +1212. Misc bindist updates. + XFree86 4.0.2 (18 December 2000) 1211. Fix a problem introduced recently when using the "ps/2" protocol for mice on FreeBSD (David Dawes). @@ -234,7 +367,7 @@ 1087. Status doc updates for Neomagic an NVIDIA (#4334, Andrew C. Aitchison, Mark Vojkovich). 1086. Updated Rage 128 DRI support from the DRI CVS (Gareth Hughes, VA Linux). -1085. Updates for Hurd support (#A.209, Marcus Brinkmann). +1085. - 1084. Bump the minor revisions of libXmu (UTF8_STRING) and libX11 (Xutf8LookupString). 1083. Fixes for all known bugs in the CompoundText parser and generator, @@ -741,7 +874,7 @@ 841. Modify the mga/HALlib support to allow it to be selected at run-time. This allows a driver built with HALlib to be used with older hardware (like the Millennium, Millennium 2) (#4204, - Antii Tapaninen). + Antti Tapaninen). 840. Add config/imake support for Darwin (#4200, Torrey T. Lyons). 839. Add a driver for the citron touch screen (#4199, Peter Kunzmann). 838. Fix Html man page install problem (Robin Cutshaw). @@ -12114,4 +12247,4 @@ XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1485 2000/12/18 15:55:33 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1485.2.43 2001/03/16 16:44:42 dawes Exp $ Index: xc/RELNOTES diff -u xc/RELNOTES:1.1 xc/RELNOTES:1.1.2.2 --- xc/RELNOTES:1.1 Sun Dec 17 21:45:46 2000 +++ xc/RELNOTES Fri Mar 16 11:09:19 2001 @@ -1,23 +1,23 @@ - Release Notes for XFree86[tm] 4.0.2 + Release Notes for XFree86[tm] 4.0.3 The XFree86 Project, Inc - 17 December 2000 + 16 March 2001 Abstract This document contains some information about the features present - in XFree86 4.0.2 and their status. + in XFree86 4.0.3 and their status. 1. Introduction to the 4.x Release Series -XFree86 4.0 was the first official release of the new XFree86 4 series. The -current release (4.0.2) is the latest in that series. XFree86 4 represents a -significant redesign of the XFree86 X server. Not all of the hardware -drivers from 3.3.x have been ported to 4.x yet, but conversely, 4.x has some -hardware support not present in 3.3.x. Our Driver Status document summarizes -how the hardware driver support compares between 3.3.6 and 4.0.2. Please -check there first before downloading 4.0.2. +XFree86 4.0 was the first official release of the new XFree86 4 series. +XFree86 4.0.3 is the first update to 4.0.2, which is the latest full release +in that series. XFree86 4 represents a significant redesign of the XFree86 X +server. Not all of the hardware drivers from 3.3.x have been ported to 4.x +yet, but conversely, 4.x has some hardware support not present in 3.3.x. Our +Driver Status document summarizes how the hardware driver support compares +between 3.3.6 and 4.0.3. Please check there first before downloading 4.0.3. The 4.0.1 release introduced a new graphical configuration tool, "xf86cfg", and a text mode interface was added to it for the 4.0.2 release. It is work @@ -28,7 +28,7 @@ for some hardware. To try it out, just run (as root) "XFree86 -configure". Each of these configuration options will give you a reasonable starting point for a suitable configuration file. We've put some effort into documenting -the 4.0.2 config file format, and you can find that information in the +the 4.0.3 config file format, and you can find that information in the XF86Config manual page. Check that, the driver manual pages and the related documentation for further information. @@ -37,15 +37,81 @@ save you some time and help you figure out which of the binary releases you need. -The next section describes what is new in the latest version (4.0.2). The -other sections below describe some of the new features and changes between -3.3.x and 4.0. There are lot's of new features, and we definitely don't have -enough space to cover them all here. +The next sections describe what has changed in the update release(s) as well +as what is new in the latest full release (4.0.2). The other sections below +describe some of the new features and changes between 3.3.x and 4.0. There +are lot's of new features, and we definitely don't have enough space to cover +them all here. -2. Summary of new features in 4.0.2. +2. Summary of updates in 4.0.3. -2.1 X server + o Some temporary file-related security vulnerabilities are fixed. + o Screen corruption problems and palette saving problems with some Neo- + magic chips are fixed. + + o 'XFree86 -configure' problems are fixed in some drivers (including sis + and i810). + + o A problem with some plain S3 ViRGE cards is fixed. + + o Some Xaw incompatibilities with Xaw6 are fixed. + + o Some XKB files are updated. + + o Some trident driver updates, including fixing acceleration for the + Cyber9388. + + o A palette saving problem in the vgahw module is fixed. + + o Support for the wsmouse protocol is added for OpenBSD/i386. + + o A load problem with the sis driver module, and some depth 24 problems + are fixed. + + o Support for the "PD" variant of the ATI Rage 128 is added. + + o Support for GNU Hurd is updated. + + o Some TrueType font problems are fixed. + + o The mga driver doesn't attempt to drive the G450 if the "mga_hal" module + isn't available. + + o A problem with bold font simulation in xterm is fixed. + + o The (DPS) stub files created by pswrap are now compatible with the Adobe + version. + + o Some glint driver problems are fixed. + + o Support for building on OpenBSD-current, and multi-thread support for + OpenBSD are provided. + + o A problem with the ThinkingMousePS/2 protocol is fixed in the mouse + driver. + + o Support for the Render extension with Xinerama is added. + + o A DGA-related server crash is fixed. + + o Some Chips & Technologies driver bugs are fixed. + + o Some tseng driver bugs are fixed. + + o Some Alpha platform updates are included. + + o Support for the GeForce3 is added to the nv driver. + + o Misc build-related issues are fixed. + + o Various documentation updates, including a reworked XFree86(1) manual + page. + +3. Summary of new features in 4.0.2. + +3.1 X server + o Darwin/Mac OS X is now supported and the X server runs on PowerPC. The X server for this platform is called "Xdarwin", and its installation and configuration is different from the "XFree86" server used on other plat- @@ -115,7 +181,7 @@ o Big endian problems in Xinerama have been fixed. - o The new "render" extension has been added (see below (section 4.11, page + o The new "render" extension has been added (see below (section 5.11, page 1)). The design has been extended in the following ways: o A new FillRectangles request was added. @@ -234,10 +300,10 @@ some of the bugs in the current options. A protocol for plugging in external modules is also planned. -2.2 X libraries and clients. +3.2 X libraries and clients. o Significant updates to the internationalisation support in Xlib (see - below (section 2.3, page 1)). + below (section 3.3, page 1)). o Some xfs updates, including font path verification, and new options. @@ -245,7 +311,7 @@ o New "xvinfo" client for querying the XVideo extension. -2.3 Fonts and Internationalisation +3.3 Fonts and Internationalisation o Many of the "misc" bdf fonts have been updated and extended, and a wider range of ISO-8859 subsets have been added. These are now auto-generated @@ -274,7 +340,7 @@ o XKB keyboard definitions have been added and updated for some countries. -2.4 Platforms +3.4 Platforms o Darwin/Mac OS X. @@ -285,11 +351,11 @@ o Support has been added for more Alpha platforms under Linux. This now includes all platforms that require sparse memory mapping. -3. Drivers +4. Drivers -3.1 Video Drivers +4.1 Video Drivers -XFree86 4.0.2 includes the following video drivers: +XFree86 4.0.3 includes the following video drivers: +--------------+--------------------------+----------------------------------+ |Driver Name | Description | Further Information | @@ -341,9 +407,9 @@ Darwin/Mac OS X uses IOKit drivers and does not use the module loader drivers listed above. Further information can be found in README.Darwin. -XFree86 4.0.2 includes the following input drivers: +XFree86 4.0.3 includes the following input drivers: -3.2 Input Drivers +4.2 Input Drivers +------------+--------------------+---------------------+ |Driver Name | Description | Further Information | @@ -364,21 +430,21 @@ |wacom | Wacom tablets | wacom(4) | +------------+--------------------+---------------------+ -4. Summary of XFree86 4. +5. Summary of XFree86 4. Unlike XFree86 3.3.x where there are multiple X server binaries, each of -which drive different hardware, XFree86 4.0.2 has a single X server binary +which drive different hardware, XFree86 4.0.3 has a single X server binary called XFree86. This binary can either have one or more video drivers linked in statically, or, more usually, dynamically load the video drivers and other modules that are needed. -XFree86 4.0.2 has X server support for most UNIX(R) and UNIX-like operating +XFree86 4.0.3 has X server support for most UNIX(R) and UNIX-like operating systems on Intel/x86 platforms, plus support for Linux on Alpha, PowerPC, IA-64, Sparc, and Mips platforms, and for Darwin on PowerPC. Work on support for additional architectures and operating systems is in progress, and is planned for future releases. -4.1 Loader and Modules +5.1 Loader and Modules The XFree86 X server has a built-in run-time loader, donated by Metro Link . This loader can load normal object files and @@ -394,7 +460,7 @@ the future we plan to take advantage of this to provide more frequent driver module updates in between major releases. -The loader in version 4.0.2 has support for Intel (x86), Alpha and PowerPC +The loader in version 4.0.3 has support for Intel (x86), Alpha and PowerPC platforms. It also has preliminary support for Sparc platforms. The X server makes use of modules for video drivers, X server extensions, @@ -416,7 +482,7 @@ hope to have a mechanism for signing/verifying the modules that we provide available in a future release. -4.2 Configuration File +5.2 Configuration File The X server configuration file format has been extended to handle some of the new functionality. The xf86config utility can be used to generate a @@ -576,7 +642,7 @@ and /usr/X11R6/etc/X11 being added. The full search path details are docu- mented in the XF86Config manual page. -4.3 Command Line Options +5.3 Command Line Options The following new X server command line options have been added: @@ -687,13 +753,13 @@ This makes it possible for users to choose from multiple config files that the the sysadmin has provided. -4.4 XAA +5.4 XAA The XFree86 Acceleration Architecture (XAA) has been completely rewritten from scratch for XFree86 4.x. Most drivers implement acceleration by making use of the XAA module. -4.5 Multi-head +5.5 Multi-head Some multi-head configurations are supported in XFree86 4.x, primarily with multiple PCI/AGP cards. However, this is an area that is still being worked @@ -709,7 +775,7 @@ which card is the primary card (either by using a different PCI slot, or by changing the system BIOS's preference for the primary card). -4.6 Xinerama +5.6 Xinerama Xinerama is an X server extension that allows multiple physical screens to behave as a single screen. With traditional multi-head in X11, windows can- @@ -731,14 +797,14 @@ an issue that needs to be dealt with in the individual window managers, and isn't specifically an XFree86 problem. -4.7 DGA version 2 +5.7 DGA version 2 -DGA 2.0 is included in 4.0.2, but is not implemented by all drivers. Prelim- +DGA 2.0 is included in 4.0.3, but is not implemented by all drivers. Prelim- inary documentation for the client libraries can be found in the README.DGA document. A good degree of backwards compatibility with version 1.0 is pro- vided. -4.8 DDC +5.8 DDC The VESA(R) Display Data Channel (DDC[tm]) standard allows the monitor to tell the video card (or on some cases the computer directly) about itself; @@ -760,7 +826,7 @@ the X server, or by specifying appropriate screen dimensions with the "Dis- playSize" keyword in the "Monitor" section of the config file. -4.9 GLX and the Direct Rendering Infrastructure (DRI) +5.9 GLX and the Direct Rendering Infrastructure (DRI) Precision Insight (now part of the Pro- fessional Services group at VA Linux Systems ) @@ -781,7 +847,7 @@ drivers can be found at the DRI Project on SourceForge . -4.10 XVideo Extension (Xv) +5.10 XVideo Extension (Xv) The XVideo extension is supported in XFree86 4.x. An XvQueryPortAttributes function has been added as well as support for XvImages. XvImages are XIm- @@ -789,7 +855,7 @@ through shared memory segments. This allows clients to display YUV data with high quality hardware scaling and filtering. -4.11 X Rendering Extension (Render) +5.11 X Rendering Extension (Render) The X Rendering extension provides a 2D rendering model that more closely matches application demands and hardware capabilities. It provides a render- @@ -801,7 +867,7 @@ overlays and other image operations not possible with the core X rendering system. -XFree86 4.0.2 provides a partial implementation of Render sufficient for +XFree86 4.0.3 provides a partial implementation of Render sufficient for drawing anti-aliased text and image composition. Still to be implemented are geometric primitives and affine transformation of images. @@ -811,7 +877,7 @@ access to the available font information while still providing hardware acceleration. The Xft library provides font access for Render applications. -4.11.1 The Xft Library +5.11.1 The Xft Library On the client side, the Xft library provides access to fonts for applications using the FreeType library, version 2. FreeType currently supports Type1 and @@ -833,9 +899,9 @@ cated font aliasing mechanism. Documentation for that file is included in the Xft man page. -4.11.2 Building FreeType support for Xft +5.11.2 Building FreeType support for Xft -XFree86 4.0.2 includes sources for FreeType version 2.0.1, but they are not +XFree86 4.0.3 includes sources for FreeType version 2.0.1, but they are not built and installed automatically. As a result, Xft is configured to provide only core fonts by default. @@ -853,9 +919,9 @@ Finally, build XFree86 with "make World" from the top. -4.11.3 Application Support For Anti-Aliased Text +5.11.3 Application Support For Anti-Aliased Text -Only three applications have been modified in XFree86 4.0.2 to work with the +Only three applications have been modified in XFree86 4.0.3 to work with the Render extension and the Xft and FreeType libraries to provide anti-aliased text. Xterm, xditview and x11perf. Migration of other applications may occur in future releases. @@ -874,7 +940,7 @@ through the Render extension, a path which has not been optimized within the X server yet. -4.12 Other extensions +5.12 Other extensions The XFree86-Misc extension has not been fully ported to the new server archi- tecture yet. This should be completed in a future release. @@ -887,7 +953,7 @@ 3.3.x version of the extension is provided. The missing parts of this exten- sion and some new features should be completed in a future release. -4.13 Xaw +5.13 Xaw Two versions of the Xaw library are provided with XFree86 4.x. A version with bug fixes and a few binary compatible improvements and a new version with @@ -946,11 +1012,11 @@ o Several bugs were fixed in the text code, while some code was rewritten from scratch. -4.14 Xpm +5.14 Xpm Version 3.4k of the Xpm (X pixmap) library is now integrated into XFree86. -4.15 xedit +5.15 xedit Xedit have been changed to use most of the new features added to the new ver- sion of the Xaw library, and some xedit only features were added. Emacs users @@ -989,18 +1055,18 @@ o C-mode: this mode is expected to be stable, and fully usable. -4.16 Font support +5.16 Font support Details about the font support in XFree86 4.x can be found in the README.fonts document. -4.17 TrueType support +5.17 TrueType support XFree86 4.x comes with two TrueType backends, known as `xfsft' (the "freetype" module) and `X-TrueType' (the "xtt" module). Both of these back- ends are based on the FreeType library. -4.18 CID font support +5.18 CID font support Support for CID-keyed fonts is included in XFree86 4.x. The CID-keyed font format was designed by Adobe Systems for fonts @@ -1008,7 +1074,7 @@ by SGI . See the LICENSE document for a copy of the CID Font Code Public License. -4.19 Internationalisation of the scalable font backends +5.19 Internationalisation of the scalable font backends XFree86 4.x has a ``fontenc'' layer to allow the scalable font backends to use a common method of font re-encoding. This re-encoding makes it possible @@ -1017,14 +1083,14 @@ TrueType backend. The `X-TrueType' version of the TrueType backend uses a different re-encoding method based on loadable encoding modules. -4.20 Large font optimisation +5.20 Large font optimisation The glyph metrics array, which all the X clients using a particular font have access to, is now placed in shared memory, so as to reduce redundant memory consumption. For non-local clients, the glyph metrics array is transmitted in a compressed format. -4.21 Unicode/ISO 10646 support +5.21 Unicode/ISO 10646 support What is included in 4.x: @@ -1057,7 +1123,7 @@ o Both the xfsft (the "freetype" module) and the X-TrueType (the "xtt" module) TrueType font backends support Unicode-encoded fonts. -4.22 Lucidux fonts from Bigelow and Holmes +5.22 Lucidux fonts from Bigelow and Holmes XFree86 now includes the ``Lucidux'' family of professionally hinted Type 1 fonts. This family consists of the fonts ``Lucidux Serif'', ``Lucidux Sans'' @@ -1070,7 +1136,7 @@ or , or consult Y&Y's web site . -4.23 Directory rearrangements +5.23 Directory rearrangements Some changes to the installed XFree86 directory structure have been imple- mented for 4.x. One important change is a modified search path for the X @@ -1081,7 +1147,7 @@ located under the appropriate subdirectories of /var, again with the relevant symbolic links in the old location. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.58 2000/12/17 23:01:10 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.58.2.2 2001/03/16 15:57:44 dawes Exp $ -$XFree86: xc/RELNOTES,v 1.1 2000/12/18 02:45:46 dawes Exp $ +$XFree86: xc/RELNOTES,v 1.1.2.2 2001/03/16 16:09:19 dawes Exp $ Index: xc/config/cf/FreeBSD.cf diff -u xc/config/cf/FreeBSD.cf:3.101 xc/config/cf/FreeBSD.cf:3.101.2.3 --- xc/config/cf/FreeBSD.cf:3.101 Mon Dec 4 13:49:09 2000 +++ xc/config/cf/FreeBSD.cf Fri Mar 2 17:55:19 2001 @@ -2,7 +2,7 @@ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101.2.3 2001/03/02 22:55:19 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -60,6 +60,12 @@ #define HasVarRun YES #define HasVarDb YES +#if (OSMajorVersion > 1) +#define InstallXloadSetGID NO +#else +#define InstallXloadSetGID YES +#endif + #define AvoidNullMakeCommand YES #define StripInstalledPrograms YES #define CompressAllFonts YES @@ -82,6 +88,15 @@ #define HasFlex YES #endif +#ifndef HasMktemp +#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \ + (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7) +#define HasMktemp YES +#else +#define HasMktemp NO +#endif +#endif + #define CcCmd cc #define CppCmd /usr/bin/cpp #define PreProcessCmd CppCmd @@ -210,7 +225,9 @@ /* PAM appeared in FreeBSD 3.1 */ #if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 ) +#ifndef HasPam #define HasPam YES +#endif #endif /* Index: xc/config/cf/Imake.rules diff -u xc/config/cf/Imake.rules:3.86 xc/config/cf/Imake.rules:3.86.2.1 --- xc/config/cf/Imake.rules:3.86 Tue Dec 12 12:05:30 2000 +++ xc/config/cf/Imake.rules Sat Jan 27 15:08:17 2001 @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86.2.1 2001/01/27 20:08:17 herrb Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -1217,7 +1217,7 @@ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -1258,7 +1258,7 @@ InstallHtmlManPageAliases(file,aliases,suffix) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ Index: xc/config/cf/Imake.tmpl diff -u xc/config/cf/Imake.tmpl:3.87 xc/config/cf/Imake.tmpl:3.87.2.1 --- xc/config/cf/Imake.tmpl:3.87 Sat Dec 2 14:06:57 2000 +++ xc/config/cf/Imake.tmpl Mon Feb 26 13:21:36 2001 @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.87 2000/12/02 19:06:57 herrb Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.87.2.1 2001/02/26 18:21:36 dawes Exp $ XCOMM ---------------------------------------------------------------------- /* @@ -395,6 +395,9 @@ #else #define HasCplusplus NO #endif +#endif +#ifndef HasMktemp +#define HasMktemp NO /* if you have the mktemp command */ #endif #ifndef HasNdbm #define HasNdbm NO Index: xc/config/cf/NetBSD.cf diff -u xc/config/cf/NetBSD.cf:3.87 xc/config/cf/NetBSD.cf:3.87.2.2 --- xc/config/cf/NetBSD.cf:3.87 Sun Dec 3 11:14:08 2000 +++ xc/config/cf/NetBSD.cf Sun Feb 11 16:51:42 2001 @@ -2,7 +2,7 @@ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87 2000/12/03 16:14:08 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87.2.2 2001/02/11 21:51:42 herrb Exp $ #ifndef OSName @@ -67,10 +67,19 @@ (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES #endif +/* But the standalone mktemp doesn't exist before NetBSD 1.5*/ +#if (OSMajorVersion == 0 || (OSMajorVersion == 1 && OSMinorVersion <= 4)) +# define HasMktemp NO +#else +# define HasMktemp YES +#endif + #define HasUsableFileMmap YES #define HasVarRun YES #define HasVarDb YES + +#define InstallXloadSetGID NO /* Defines for using the GNU pth thread library -- experimental */ Index: xc/config/cf/OpenBSD.cf diff -u xc/config/cf/OpenBSD.cf:3.44 xc/config/cf/OpenBSD.cf:3.44.2.5 --- xc/config/cf/OpenBSD.cf:3.44 Sat Dec 2 15:15:03 2000 +++ xc/config/cf/OpenBSD.cf Fri Mar 2 15:40:45 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44 2000/12/02 20:15:03 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44.2.5 2001/03/02 20:40:45 herrb Exp $ XCOMM #ifndef OSName @@ -72,10 +72,20 @@ #define HasVarRun YES #define HasVarDb YES +#define InstallXloadSetGID NO + #ifndef HasLibPthread #define HasLibPthread NO #endif +#ifndef HasMktemp +# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1) +# define HasMktemp YES +# else +# define HasMktemp NO +# endif +#endif + /* * Multi-thread safe libs */ @@ -93,9 +103,8 @@ # endif #endif -#if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3 -# define HasThreadSafeAPI YES -#endif +/* Set this to YES when getpwuid_r is added to libc_r */ +# define HasThreadSafeAPI NO /* * Compiler Features @@ -147,7 +156,11 @@ # define LdPostLib /**/ # define ServerExtraDefines GccGasOption XFree86ServerDefines # ifndef XFree86ConsoleDefines +# if OSMajorVersion == 2 && OSMinorVersion <= 8 # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT +# else +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# endif # endif #endif @@ -424,8 +437,10 @@ # endif /* Support for USB Mices */ -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) -# define UsbMouseSupport YES +# ifndef UsbMouseSupport +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) +# define UsbMouseSupport YES +# endif # endif /* Index: xc/config/cf/X11.tmpl diff -u xc/config/cf/X11.tmpl:1.93 xc/config/cf/X11.tmpl:1.93.2.3 --- xc/config/cf/X11.tmpl:1.93 Fri Dec 15 13:18:04 2000 +++ xc/config/cf/X11.tmpl Thu Mar 15 14:14:15 2001 @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93.2.3 2001/03/15 19:14:15 dawes Exp $ /*************************************************************************** * * @@ -310,6 +310,9 @@ #ifndef BuildXftLibrary #define BuildXftLibrary BuildRenderLibrary #endif +#ifndef BuildFreetype2Library +#define BuildFreetype2Library BuildXftLibrary +#endif #ifndef BuildMiscDocs #define BuildMiscDocs NO @@ -339,6 +342,9 @@ #ifndef InstallXtermSetUID #define InstallXtermSetUID YES /* xterm needs to be set uid */ #endif +#ifndef InstallXloadSetGID +#define InstallXloadSetGID YES /* xload often needs set gid kmem */ +#endif #ifndef InstallXinitConfig #define InstallXinitConfig NO /* install sample xinit config */ #endif @@ -358,6 +364,12 @@ #ifndef InstallAppDefFiles #define InstallAppDefFiles YES /* install application defaults */ #endif +#ifndef UseConfDirForAppDefaults +#define UseConfDirForAppDefaults YES +#endif +#ifndef UseConfDirForXkb +#define UseConfDirForXkb YES +#endif #ifndef CompressAllFonts #define CompressAllFonts NO #endif @@ -1203,7 +1215,11 @@ RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir +#if HasPerl + MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) +#else MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh +#endif UCS2ANY = $(FONTSRC)/util/ucs2any.pl BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl UCSMAPPREFIX = $(FONTSRC)/util/map- @@ -2201,6 +2217,60 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif +#ifndef SharedLibFreetype2 +#define SharedLibFreetype2 HasSharedLibraries +#endif +#ifndef NormalLibFreetype2 +#define NormalLibFreetype2 (!SharedLibFreetype2 | ForceNormalLib) +#endif +#ifndef DebugLibFreetype2 +#define DebugLibFreetype2 NO +#endif +#ifndef ProfileLibFreetype2 +#define ProfileLibFreetype2 NO +#endif + FREETYPE2LIBSRC = $(LIBSRC)/freetype2 +#if SharedLibFreetype2 +#ifndef SharedFreetype2Rev +#define SharedFreetype2Rev 6.0 +#endif +SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) +#else +ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) +#endif + +#if BuildFreetype2Library +FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 +FREETYPE2DEFINES=-DFREETYPE2 +#define HasFreetype2 YES +#else + +#ifdef Freetype2Dir + +#define HasFreetype2 YES + +#ifndef Freetype2LibDir +#define Freetype2LibDir Freetype2Dir/lib +#endif + +#ifndef Freetype2IncDir +#define Freetype2IncDir Freetype2Dir/include/freetype2 +#endif + +FREETYPE2DIR = Freetype2Dir +FREETYPE2LIBDIR = Freetype2LibDir +FREETYPE2INCDIR = Freetype2IncDir +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype +FREETYPE2DEFINES = -DFREETYPE2 +#endif + +#endif + +#ifndef HasFreetype2 +#define HasFreetype2 NO +#endif + #ifndef SharedLibXft #define SharedLibXft HasSharedLibraries #endif @@ -2347,6 +2417,7 @@ * if the InstallAppDefFiles configuration parameter is set. */ #ifndef InstallAppDefaultsLong +#if UseConfDirForAppDefaults #if InstallAppDefFiles #define InstallAppDefaultsLong(file,class) @@\ LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ @@ -2356,6 +2427,15 @@ LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) #endif /* InstallAppDefFiles */ +#else /* UseConfDirForAppDefaults */ +#if InstallAppDefFiles +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#else +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#endif /* InstallAppDefFiles */ +#endif /* UseConfDirForAppDefaults */ #endif /* InstallAppDefaultsLong */ /* Index: xc/config/cf/gnu.cf diff -u xc/config/cf/gnu.cf:1.10 xc/config/cf/gnu.cf:1.10.2.1 --- xc/config/cf/gnu.cf:1.10 Thu Nov 30 18:29:55 2000 +++ xc/config/cf/gnu.cf Wed Feb 28 10:59:10 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.10 2000/11/30 23:29:55 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.10.2.1 2001/02/28 15:59:10 dawes Exp $ #ifndef OSName #define OSName DefaultOSName @@ -37,12 +37,11 @@ #define HasLibCrypt YES #endif -#define BuildLibPathVar LD_LIBRARY_PATH -#define HasGcc YES -#define HasGcc2 YES -#ifndef HasGcc2ForCplusplus -# define HasGcc2ForCplusplus YES +#ifndef BuildXF86RushExt +# define BuildXF86RushExt YES #endif + +#define BuildLibPathVar LD_LIBRARY_PATH #define GccUsesGas YES #define UseGas YES #define GnuCpp YES @@ -124,7 +123,7 @@ #define StandardCppDefines StandardDefines #define HasVarRun YES -#define VarDbDirectory $(VARDIR)/state +#define VarDbDirectory $(VARDIR)/lib XCOMM i386Architecture #define OptimizedCDebugFlags DefaultGcc2i386Opt Index: xc/config/cf/linux.cf diff -u xc/config/cf/linux.cf:3.157 xc/config/cf/linux.cf:3.157.2.1 --- xc/config/cf/linux.cf:3.157 Thu Dec 14 12:00:46 2000 +++ xc/config/cf/linux.cf Mon Jan 22 14:49:19 2001 @@ -4,7 +4,7 @@ -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157.2.1 2001/01/22 19:49:19 dawes Exp $ #ifndef LinuxElfDefault # define LinuxElfDefault YES @@ -215,6 +215,10 @@ # ifndef HasLibCrypt # define HasLibCrypt NO # endif +#endif + +#ifndef InstallXloadSetGID +#define InstallXloadSetGID NO #endif /* support mainly for USB support */ Index: xc/config/cf/osf1.cf diff -u xc/config/cf/osf1.cf:3.6 xc/config/cf/osf1.cf:3.6.8.2 --- xc/config/cf/osf1.cf:3.6 Wed Jun 11 08:24:18 1997 +++ xc/config/cf/osf1.cf Wed Feb 28 21:14:41 2001 @@ -1,6 +1,10 @@ XCOMM platform: $TOG: osf1.cf /main/74 1997/05/27 15:51:24 kaleb $ /* only tested with Digital OSF/1 */ + + +XCOMM platform: $XFree86: xc/config/cf/osf1.cf,v 3.6.8.2 2001/03/01 02:14:41 dawes Exp $ + #ifndef OSName # define OSName DefaultOSName #endif @@ -35,6 +39,9 @@ #define ShLibDir /usr/shlib #define SharedLibPex NO /* losing, no shared -lm */ #endif + +#define InstallXloadSetGID NO + #define ThreadedX ModernOSF1 #if ThreadedX Index: xc/config/cf/xf86site.def diff -u xc/config/cf/xf86site.def:3.170 xc/config/cf/xf86site.def:3.170.2.2 --- xc/config/cf/xf86site.def:3.170 Thu Dec 14 11:38:45 2000 +++ xc/config/cf/xf86site.def Mon Feb 26 13:21:37 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170.2.2 2001/02/26 18:21:37 dawes Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the Index: xc/config/cf/xfree86.cf diff -u xc/config/cf/xfree86.cf:3.338 xc/config/cf/xfree86.cf:3.338.2.6 --- xc/config/cf/xfree86.cf:3.338 Thu Dec 14 11:59:06 2000 +++ xc/config/cf/xfree86.cf Thu Mar 15 17:58:45 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338.2.6 2001/03/15 22:58:45 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -97,7 +97,7 @@ * you don't need to have the HALlib library to do this. * but you want to build support for loading it and using * it into the mga driver module. - * Default: YES for loadable server build + * Default: YES for loadable server build on x86 * (HaveMatroxHal || BuildMatroxHal) for static */ @@ -110,7 +110,7 @@ #endif #ifndef UseMatroxHal -#if DoLoadableServer +#if DoLoadableServer && defined(i386Architecture) #define UseMatroxHal YES #else #define UseMatroxHal (HaveMatroxHal || BuildMatroxHal) @@ -988,7 +988,7 @@ (defined(LinuxArchitecture) && !defined(Mc68020Architecture) && \ !defined(PpcArchitecture)) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) + defined(OS2Architecture) || defined(GNUMachArchitecture) # define BuildScanpci YES # else # define BuildScanpci NO @@ -1176,9 +1176,16 @@ * * X * 1000 + Y * 100 + Z * 10 + W * + * + * NOTE: Starting with XFree86 development version 4.0.99.1 (leading up + * to the 4.1.0 release version) XFree86Version for version M.m.P.s will + * be calculated as: + * + * M * 10000000 + m * 100000 + P * 1000 + s + * */ #ifndef XFree86Version -# define XFree86Version 4002 +# define XFree86Version 4003 #endif #ifndef XVendorString Index: xc/config/pswrap/Imakefile diff -u xc/config/pswrap/Imakefile:1.6 xc/config/pswrap/Imakefile:1.6.2.1 --- xc/config/pswrap/Imakefile:1.6 Wed Jun 7 17:58:25 2000 +++ xc/config/pswrap/Imakefile Wed Feb 28 20:06:17 2001 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $ +XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6.2.1 2001/03/01 01:06:17 dawes Exp $ - FRIENDSDEF = -DFRIENDSFILE='""' + FRIENDSDEF = -DFRIENDSFILE='""' DEFINES = -DXENVIRONMENT DEPLIBS = YFLAGS = -d Index: xc/config/pswrap/pswfile.c diff -u xc/config/pswrap/pswfile.c:1.4 xc/config/pswrap/pswfile.c:1.4.2.1 --- xc/config/pswrap/pswfile.c:1.4 Wed Jun 7 17:58:25 2000 +++ xc/config/pswrap/pswfile.c Wed Feb 28 20:06:17 2001 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswfile.c,v 1.4 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/pswfile.c,v 1.4.2.1 2001/03/01 01:06:17 dawes Exp $ */ #include #include "pswversion.h" @@ -81,12 +81,11 @@ #endif /* __MACH__ */ printf("#include %s\n", FRIENDSFILE); printf("#include \n"); - if (special_h == 0) { - printf("#include \"%spsops.h\"\n\n", dpsops ? "d" : ""); - } else { + outlineno += 3; /* UPDATE this if you add more prolog */ + if (special_h) { printf("#include \"%s\"\n\n", special_h); + outlineno ++; } - outlineno += 4; /* UPDATE this if you add more prolog */ printf("#line 1 \"%s\"\n",ifile); outlineno++; } Index: xc/config/pswrap/pswversion.h diff -u xc/config/pswrap/pswversion.h:1.1 xc/config/pswrap/pswversion.h:1.1.2.2 --- xc/config/pswrap/pswversion.h:1.1 Sat Feb 12 19:12:35 2000 +++ xc/config/pswrap/pswversion.h Wed Feb 28 21:14:42 2001 @@ -35,7 +35,8 @@ * * Author: Adobe Systems Incorporated */ +/* $XFree86: xc/config/pswrap/pswversion.h,v 1.1.2.2 2001/03/01 02:14:42 dawes Exp $ */ -#define PSW_VERSION "V1.009 Wed Apr 19 17:50:24 PDT 1989" +#define PSW_VERSION "V1.009 XFree86" #define PSW_OS "unix" Index: xc/config/util/Imakefile diff -u xc/config/util/Imakefile:3.29 xc/config/util/Imakefile:3.29.2.3 --- xc/config/util/Imakefile:3.29 Wed Dec 6 10:35:01 2000 +++ xc/config/util/Imakefile Thu Mar 15 14:14:17 2001 @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.29 2000/12/06 15:35:01 eich Exp $ +XCOMM $XFree86: xc/config/util/Imakefile,v 3.29.2.3 2001/03/15 19:14:17 dawes Exp $ #if UseCCMakeDepend MDEP_PROG = makedepend @@ -127,7 +127,11 @@ InstallNamedProg(mergelib,mergelib,$(BINDIR)) InstallNamedProg(makeg.sh,makeg,$(BINDIR)) InstallManPage(makeg,$(MANDIR)) +#if HasPerl +InstallNamedProg(mkhtmlindex.pl,mkhtmlindex,$(BINDIR)) +#else InstallNamedProg(mkhtmlindex.sh,mkhtmlindex,$(BINDIR)) +#endif #endif InstallManPage(mkdirhier,$(MANDIR)) #if UseCCMakeDepend Index: xc/config/util/gccmdep.cpp diff -u xc/config/util/gccmdep.cpp:3.5 xc/config/util/gccmdep.cpp:3.5.2.3 --- xc/config/util/gccmdep.cpp:3.5 Tue Nov 14 16:59:21 2000 +++ xc/config/util/gccmdep.cpp Thu Mar 15 16:16:08 2001 @@ -3,7 +3,7 @@ XCOMM XCOMM makedepend which uses 'gcc -M' XCOMM -XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5 2000/11/14 21:59:21 dawes Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5.2.3 2001/03/15 21:16:08 tsi Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu XCOMM @@ -30,10 +30,10 @@ endmarker= else case "$1" in - -D*|-I*) + -D*|-I*|-U*) args="$args '$1'" ;; - -g|-O*) + -g*|-O*) ;; *) if [ "$endmarker"x = x ]; then @@ -48,12 +48,17 @@ magic_string="$2" shift ;; - -f-) - makefile="-" - ;; - -f) - makefile="$2" - shift + -f*) + if [ "$1" = "-f-" ]; then + makefile="-" + elif [ "$1" = "-f" ]; then + makefile="$2" + shift + else + echo "$1" | sed 's/^\-f//' >${TMP}arg + makefile="`cat ${TMP}arg`" + rm -f ${TMP}arg + fi ;; --*) endmarker=`echo $1 | sed 's/^\-\-//'` Index: xc/config/util/mdepend.cpp diff -u xc/config/util/mdepend.cpp:3.3 xc/config/util/mdepend.cpp:3.3.2.3 --- xc/config/util/mdepend.cpp:3.3 Mon Aug 7 23:16:26 2000 +++ xc/config/util/mdepend.cpp Thu Mar 15 16:16:08 2001 @@ -22,7 +22,7 @@ XCOMM USG users will probably have to change "silent" to "-s" instead of XCOMM "-" (at least, that is what the documentation implies). XCOMM -XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3 2000/08/08 03:16:26 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3.2.3 2001/03/15 21:16:08 tsi Exp $ XCOMM CC=PREPROC @@ -66,7 +66,7 @@ endmarker="" else case "$1" in - -D*|-I*) + -D*|-I*|-U*) echo $n " '$1'$c" >> $ARGS ;; @@ -87,9 +87,13 @@ -f*) if [ "$1" = "-f-" ]; then makefile="-" - else + elif [ "$1" = "-f" ]; then makefile="$2" shift + else + echo "$1" | sed 's/^\-f//' >${TMP}arg + makefile="`cat ${TMP}arg`" + rm -f ${TMP}arg fi ;; -o) Index: xc/config/util/mkhtmlindex.pl diff -u /dev/null xc/config/util/mkhtmlindex.pl:1.2.2.1 --- /dev/null Fri Mar 16 21:20:25 2001 +++ xc/config/util/mkhtmlindex.pl Thu Mar 15 14:14:17 2001 @@ -0,0 +1,103 @@ +#!/usr/bin/perl +# +# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.2.2.1 2001/03/15 19:14:17 dawes Exp $ +# +# Copyright © 2000,2001 by VA Linux Systems, Inc. +# +# Generate index files for HTML man pages. +# +# Author: David Dawes +# + +# +# Best viewed with tabs set to 4 +# + +if ($#ARGV ne 0) { + print STDERR "Usage: mkhtmlindex.pl htmlmandir\n"; + exit 1; +} + +$dir = $ARGV[0]; + +if (! -d $dir) { + print STDERR "$dir is not a directory\n"; + exit 1; +} + +@vollist = ("1", "2", "3", "4", "5", "6", "7", "8", "9", "o", "l", "n", "p"); + +$indexprefix = "manindex"; + +foreach $vol (@vollist) { + $empty = "yes"; + $indexname="$dir/$indexprefix$vol.html"; + + # print "Processing volume $vol\n"; + + open(mindex, ">$indexname") || die "Can't create $indexname"; + opendir(dir, "$dir") || die "Can't open $dir"; + + print mindex < + + + +XFree86[tm] Manual pages: Section $vol + + + +

XFree86[tm] Manual pages: Section $vol

+

+

    +EOF + + foreach $file (readdir dir) { + if ($file =~ "\.$vol\.html") { + open(file, "<$dir/$file") || die "Can't open $dir/$file"; + while () { + chop; + if (/^

    /) { + if (! /<\/H2>$/) { + while ( && ! /<\/H2>$/) { + ; + } + } + $heading = ""; + while () { + if (/^

    /) { + last; + } + $heading = "$heading" . "$_"; + } + if ($heading) { + undef $empty; + $heading =~ s/--/-/; + ($name, $descr) = split(/-/, $heading, 2); + $file =~ /(.*)\.$vol\.html/; + $fname = $1; + $descr =~ s/<[P]>//g; + print mindex + "
  • $fname - $descr
    • "; + } + last; + } + } + close file; + } + } + + print mindex < +

    + + +EOF + + close mindex; + closedir dir; + if (defined $empty) { + # print "Removing empty $indexname\n"; + unlink $indexname; + } +} Index: xc/extras/rman/rman.c diff -u xc/extras/rman/rman.c:1.12 xc/extras/rman/rman.c:1.12.2.1 --- xc/extras/rman/rman.c:1.12 Fri Dec 1 13:48:08 2000 +++ xc/extras/rman/rman.c Thu Dec 21 14:01:07 2000 @@ -16,7 +16,7 @@ source interpretation added September 24, 1996 renamed PolyglotMan due to lawsuit by Rosetta, Inc. August 8, 1997 */ -/* $XFree86: xc/extras/rman/rman.c,v 1.12 2000/12/01 18:48:08 dawes Exp $ */ +/* $XFree86: xc/extras/rman/rman.c,v 1.12.2.1 2000/12/21 19:01:07 dawes Exp $ */ /* TO DO **** @@ -474,12 +474,14 @@ { char *p0; static char *nonhref = "\">'"; + static char *punct = ".,:;)]}?!"; while (*p==' ') p++; if (strincmp(p,"http",4)==0) { href="%s"; manrefname = p; p+=4; while (*p && !isspace(*p) && !strchr(nonhref,*p)) p++; + while (strchr(punct, *(p - 1))) p--; } else { href = manRef; Index: xc/include/Xos.h diff -u xc/include/Xos.h:3.30 xc/include/Xos.h:3.30.2.1 --- xc/include/Xos.h:3.30 Thu Aug 10 13:40:27 2000 +++ xc/include/Xos.h Wed Feb 28 10:59:11 2001 @@ -23,7 +23,7 @@ * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.30 2000/08/10 17:40:27 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.30.2.1 2001/02/28 15:59:11 dawes Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -149,10 +149,10 @@ #endif /* CSRG_BASED */ /* - * Get struct timeval + * Get struct timeval and struct tm */ -#ifdef SYSV +#if defined(SYSV) && !defined(_SEQUENT_) #ifndef USL #include @@ -209,8 +209,7 @@ #include #elif defined(MINIX) || defined(_SEQUENT_) || defined(Lynx) #include -#else -#ifdef __QNX__ +#elif defined (__QNX__) typedef unsigned long fd_mask; /* Make sure we get 256 bit select masks */ #define FD_SETSIZE 256 @@ -219,7 +218,7 @@ #include #else #include -#endif /* QNX */ +#include #endif /* defined(_POSIX_SOURCE) && defined(SVR4) */ #endif /* SYSV */ Index: xc/include/Xos_r.h diff -u xc/include/Xos_r.h:1.7 xc/include/Xos_r.h:1.7.2.1 --- xc/include/Xos_r.h:1.7 Mon Aug 28 11:29:11 2000 +++ xc/include/Xos_r.h Fri Mar 2 15:40:45 2001 @@ -18,7 +18,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/include/Xos_r.h,v 1.7 2000/08/28 15:29:11 dawes Exp $ */ +/* $XFree86: xc/include/Xos_r.h,v 1.7.2.1 2001/03/02 20:40:45 herrb Exp $ */ /* * Various and sundry Thread-Safe functions used by X11, Motif, and CDE. @@ -245,7 +245,7 @@ /* NetBSD, at least, is missing several of the unixware passwd fields. */ -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) { memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); Index: xc/include/Xosdefs.h diff -u xc/include/Xosdefs.h:3.14 xc/include/Xosdefs.h:3.14.6.1 --- xc/include/Xosdefs.h:3.14 Sun Dec 20 06:56:46 1998 +++ xc/include/Xosdefs.h Wed Mar 7 11:04:15 2001 @@ -21,7 +21,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/include/Xosdefs.h,v 3.14 1998/12/20 11:56:46 dawes Exp $ */ +/* $XFree86: xc/include/Xosdefs.h,v 3.14.6.1 2001/03/07 16:04:15 dawes Exp $ */ #ifndef _XOSDEFS_H_ #define _XOSDEFS_H_ @@ -118,8 +118,12 @@ #endif #ifdef __GNU__ +#ifndef PATH_MAX #define PATH_MAX 4096 +#endif +#ifndef MAXPATHLEN #define MAXPATHLEN 4096 +#endif #endif #endif /* _XOSDEFS_H_ */ Index: xc/lib/Imakefile diff -u xc/lib/Imakefile:3.41 xc/lib/Imakefile:3.41.2.2 --- xc/lib/Imakefile:3.41 Thu Nov 2 15:39:07 2000 +++ xc/lib/Imakefile Mon Mar 12 13:32:59 2001 @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/39 1997/02/26 18:09:44 kaleb $ -XCOMM $XFree86: xc/lib/Imakefile,v 3.41 2000/11/02 20:39:07 dawes Exp $ +XCOMM $XFree86: xc/lib/Imakefile,v 3.41.2.2 2001/03/12 18:32:59 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -80,6 +80,10 @@ XFTLIBDIR = Xft #endif +#if BuildFreetype2Library +FREETYPE2BUILDDIR = freetype2 +#endif + XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \ $(XF86DGALIBDIR) $(XF86RUSHLIBDIR) @@ -112,7 +116,8 @@ PEX5 $(XKBLIBDIR) $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) \ Xp $(XVLIBDIR) $(GLXLIBDIR) $(GLWLIBDIR) $(DPSLIBDIR) \ $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ - $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(XFTLIBDIR) + $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \ + $(XFTLIBDIR) #else #if XnestServer || BuildGLXLibrary XEXTDIR = Xext @@ -121,7 +126,7 @@ LINTSUBDIRS = Xau Xdmcp X11 $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \ $(XKBUILIBDIR) $(LBXUTILDIR) $(XF86EXTLIBS) $(XVLIBDIR) \ $(GLXLIBDIR) $(GLWLIBDIR) $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \ - $(XFTLIBDIR) + $(FREETYPE2BUILDDIR) $(XFTLIBDIR) #endif SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTCACHELIBDIR) Index: xc/lib/X11/imThaiFlt.c diff -u xc/lib/X11/imThaiFlt.c:3.6 xc/lib/X11/imThaiFlt.c:3.6.2.1 --- xc/lib/X11/imThaiFlt.c:3.6 Sat Dec 2 10:30:22 2000 +++ xc/lib/X11/imThaiFlt.c Fri Mar 16 11:44:41 2001 @@ -41,7 +41,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.6 2000/12/02 15:30:22 tsi Exp $ */ +/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.6.2.1 2001/03/16 16:44:41 dawes Exp $ */ /* **++ @@ -564,13 +564,63 @@ #define BellVolume 0 +#define ucs2tis(wc) \ + (unsigned char) ( \ + (0<=(wc)&&(wc)<=0x7F) ? \ + (wc) : \ + ((0x0E01<=(wc)&&(wc)<=0x0E5F) ? ((wc)-0x0E00+0xA0) : 0)) + /* * Macros to save and recall last input character in XIC */ #define IC_SavePreviousChar(ic,ch) \ (*((ic)->private.local.context->mb) = (char) (ch)) -#define IC_GetPreviousChar(ic,ch) \ - ((ch) = (unsigned char) *((ic)->private.local.context->mb)) +/* +#define IC_GetPreviousChar(ic) \ + ((unsigned char) *((ic)->private.local.context->mb)) +*/ +Private unsigned char +#if NeedFunctionPrototypes +IC_GetPreviousChar(Xic ic) +#else +IC_GetPreviousChar(ic) + Xic ic; +#endif +{ + XICCallback* cb = &ic->core.string_conversion_callback; + + if (cb && cb->callback) { + XIMStringConversionCallbackStruct screc; + unsigned char c; + + screc.position = 0; + screc.direction = XIMBackwardChar; + screc.operation = XIMStringConversionRetrieval; + screc.factor = 2; + screc.text = 0; + + (cb->callback)((XIC)ic, cb->client_data, (XPointer)&screc); + if (!screc.text) { return 0; } + if ((screc.text->feedback && + *screc.text->feedback == XIMStringConversionLeftEdge) || + screc.text->length < 2) + { + c = 0; + } else { + if (screc.text->encoding_is_wchar) { + c = ucs2tis(screc.text->string.wcs[1]); + XFree(screc.text->string.wcs); + } else { + c = screc.text->string.mbs[1]; + XFree(screc.text->string.mbs); + } + } + XFree(screc.text); + return c; + } else { + return (unsigned char) *((ic)->private.local.context->mb); + } +} #define IC_ClearPreviousChar(ic) \ (*((ic)->private.local.context->mb) = 0) /* @@ -1194,12 +1244,17 @@ (XK_KP_F1 <= symbol && symbol <= XK_KP_Delete) || (XK_KP_Multiply <= symbol && symbol <= XK_KP_9) || (XK_F1 <= symbol && symbol <= XK_F35) || - (symbol == XK_KP_Equal) || - (symbol == NoSymbol)))) + (symbol == XK_KP_Equal)))) { IC_ClearPreviousChar(ic); return False; } + if (((symbol >> 8 == 0xFF) && + (XK_Shift_L <= symbol && symbol <= XK_Hyper_R)) || + (symbol == NoSymbol)) + { + return False; + } #if 0 if (! XThaiTranslateKey(ev->xkey.display, ev->xkey.keycode, ev->xkey.state, &modifiers, &symbol, &lsym, &usym)) @@ -1234,8 +1289,8 @@ * Thai Input sequence check */ isc_mode = IC_IscMode(ic); - if (!IC_GetPreviousChar(ic, previous_char)) previous_char = ' '; - if (!THAI_isaccepted(buf[0],previous_char, isc_mode)) { + if (!(previous_char = IC_GetPreviousChar(ic))) previous_char = ' '; + if (!THAI_isaccepted(buf[0], previous_char, isc_mode)) { /* reject character */ XBell(ev->xkey.display, BellVolume); return True; Index: xc/lib/X11/omGeneric.c diff -u xc/lib/X11/omGeneric.c:3.17 xc/lib/X11/omGeneric.c:3.17.2.1 --- xc/lib/X11/omGeneric.c:3.17 Tue Nov 28 13:49:52 2000 +++ xc/lib/X11/omGeneric.c Fri Mar 2 17:55:19 2001 @@ -31,7 +31,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/omGeneric.c,v 3.17 2000/11/28 18:49:52 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omGeneric.c,v 3.17.2.1 2001/03/02 22:55:19 dawes Exp $ */ /* * Fixed the algorithms in parse_fontname() and parse_fontdata() @@ -1158,7 +1158,7 @@ } vrotate_num = font_set->vrotate_num = sub_num; } else { - font_set->vrotate = (VRotate)NULL; + vrotate = font_set->vrotate = (VRotate)NULL; } ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num, Index: xc/lib/Xaw/AsciiSrc.c diff -u xc/lib/Xaw/AsciiSrc.c:1.25 xc/lib/Xaw/AsciiSrc.c:1.25.2.1 --- xc/lib/Xaw/AsciiSrc.c:1.25 Tue Nov 28 12:25:09 2000 +++ xc/lib/Xaw/AsciiSrc.c Sat Jan 27 15:06:11 2001 @@ -22,7 +22,7 @@ */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.25 2000/11/28 17:25:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.25.2.1 2001/01/27 20:06:11 herrb Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). @@ -1456,7 +1456,7 @@ open_mode = O_WRONLY | O_CREAT | O_EXCL; fdopen_mode = "w"; } - else + else { /* O_NOFOLLOW is a FreeBSD & Linux extension */ #ifdef O_NOFOLLOW open_mode = O_RDWR | O_NOFOLLOW; @@ -1464,6 +1464,7 @@ open_mode = O_RDWR; /* unsafe; subject to race conditions */ #endif /* O_NOFOLLOW */ fdopen_mode = "r+"; + } break; default: XtErrorMsg("badMode", "asciiSourceCreate", "XawError", Index: xc/lib/Xaw/Form.c diff -u xc/lib/Xaw/Form.c:1.18 xc/lib/Xaw/Form.c:1.18.2.1 --- xc/lib/Xaw/Form.c:1.18 Thu Oct 26 13:57:49 2000 +++ xc/lib/Xaw/Form.c Fri Feb 9 15:45:08 2001 @@ -1,4 +1,4 @@ -/* $TOG: Form.c /main/54 1998/05/14 14:55:45 kaleb $ */ +/* $Xorg: Form.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -43,7 +43,7 @@ ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.c,v 1.18 2000/10/26 17:57:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.c,v 1.18.2.1 2001/02/09 20:45:08 paulo Exp $ */ #include #include @@ -582,6 +582,11 @@ always_resize_children = ChangeFormGeometry((Widget)fw, False, maxx, maxy, NULL, NULL); +#ifdef OLDXAW + fw->form.old_width = fw->core.width; + fw->form.old_height = fw->core.height; +#endif + if (force_relayout) ret_val = True; else @@ -656,7 +661,6 @@ static void LayoutChild(Widget w) { - FormWidget fw = (FormWidget)XtParent(w); FormConstraints form = (FormConstraints)w->core.constraints; Widget ref; @@ -684,22 +688,16 @@ form->form.new_y = form->form.dy; if ((ref = form->form.horiz_base) != NULL) { FormConstraints ref_form = (FormConstraints)ref->core.constraints; - Dimension width; LayoutChild(ref); - width = fw->form.old_width ? - ref_form->form.virtual_width : XtWidth(ref); - form->form.new_x += ref_form->form.new_x + width + + form->form.new_x += ref_form->form.new_x + XtWidth(ref) + (XtBorderWidth(ref) << 1); } if ((ref = form->form.vert_base) != NULL) { FormConstraints ref_form = (FormConstraints)ref->core.constraints; - Dimension height; LayoutChild(ref); - height = fw->form.old_height ? - ref_form->form.virtual_height : XtHeight(ref); - form->form.new_y += ref_form->form.new_y + height + + form->form.new_y += ref_form->form.new_y + XtHeight(ref) + (XtBorderWidth(ref) << 1); } @@ -891,8 +889,6 @@ * The window will be updated when no_refigure is set back * to False */ - form->form.virtual_width = XtWidth(w); - form->form.virtual_height = XtHeight(w); form->form.deferred_resize = True; ret_val = XtGeometryDone; } @@ -902,6 +898,8 @@ /* * Resets everything. */ + fw->form.old_width = XtWidth(fw); + fw->form.old_height = XtHeight(fw); for (childP = children; childP - children < num_children; childP++) { Widget nw = *childP; @@ -916,8 +914,6 @@ nform->form.virtual_height = XtHeight(nw); } } - fw->form.old_width = XtWidth(fw); - fw->form.old_height = XtHeight(fw); } else { XtWidth(w) = old_width; @@ -1022,23 +1018,21 @@ (*((FormWidgetClass)w->core.widget_class)->form_class.layout) (fw, XtWidth(w), XtHeight(w), True); - if (!fw->form.old_width || !fw->form.old_height) { - fw->form.old_width = XtWidth(w); - fw->form.old_height = XtHeight(w); - for (children = childP = fw->composite.children; - childP - children < num_children; - childP++) { - child = *childP; - if (!XtIsManaged(child)) - continue; - form = (FormConstraints)child->core.constraints; + fw->form.old_width = XtWidth(w); + fw->form.old_height = XtHeight(w); + for (children = childP = fw->composite.children; + childP - children < num_children; + childP++) { + child = *childP; + if (!XtIsManaged(child)) + continue; + form = (FormConstraints)child->core.constraints; #ifndef OLDXAW - form->form.virtual_x = XtX(child); - form->form.virtual_y = XtY(child); + form->form.virtual_x = XtX(child); + form->form.virtual_y = XtY(child); #endif - form->form.virtual_width = XtWidth(child); - form->form.virtual_height = XtHeight(child); - } + form->form.virtual_width = XtWidth(child); + form->form.virtual_height = XtHeight(child); } } Index: xc/lib/Xaw/MultiSrc.c diff -u xc/lib/Xaw/MultiSrc.c:1.19 xc/lib/Xaw/MultiSrc.c:1.19.2.1 --- xc/lib/Xaw/MultiSrc.c:1.19 Mon Jul 19 09:36:02 1999 +++ xc/lib/Xaw/MultiSrc.c Sat Jan 27 15:06:56 2001 @@ -27,7 +27,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19 1999/07/19 13:36:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19.2.1 2001/01/27 20:06:56 herrb Exp $ */ /* @@ -67,6 +67,10 @@ #include "XawI18n.h" #include "Private.h" +#include +#include +#include + #define MAGIC_VALUE ((XawTextPosition)-1) #define streq(a, b) (strcmp((a), (b)) == 0) @@ -1158,7 +1162,9 @@ static FILE * InitStringOrFile(MultiSrcObject src, Bool newString) { - char *open_mode = NULL; + mode_t open_mode; + const char *fdopen_mode = NULL; + int fd; FILE *file; char fileName[TMPSIZ]; Display *d = XtDisplayOfObject((Widget)src); @@ -1208,7 +1214,8 @@ XtErrorMsg("NoFile", "multiSourceCreate", "XawError", "Creating a read only disk widget and no file specified.", NULL, 0); - open_mode = "r"; + open_mode = O_RDONLY; + fdopen_mode = "r"; break; case XawtextAppend: case XawtextEdit: @@ -1218,10 +1225,18 @@ (void)tmpnam((char *)src->multi_src.string); src->multi_src.is_tempfile = True; - open_mode = "w"; + open_mode = O_WRONLY | O_CREAT | O_EXCL; + fdopen_mode = "w"; } - else - open_mode = "r+"; + else { +/* O_NOFOLLOW is a BSD & Linux extension */ +#ifdef O_NOFOLLOW + open_mode = O_RDWR | O_NOFOLLOW; +#else + open_mode = O_RDWR; /* unsafe; subject to race conditions */ +#endif + fdopen_mode = "r+"; + } break; default: XtErrorMsg("badMode", "multiSourceCreate", "XawError", @@ -1243,12 +1258,14 @@ } if (!src->multi_src.is_tempfile) { - if ((file = fopen((char *)src->multi_src.string, open_mode)) != NULL) { - (void)fseek(file, 0, 2); - src->multi_src.length = ftell(file); - return file; + if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != 0) { + if ((file = fdopen(fd, fdopen_mode)) != NULL) { + (void)fseek(file, 0, SEEK_END); + src->multi_src.length = (XawTextPosition)ftell(file); + return(file); + } } - else { + { String params[2]; Cardinal num_params = 2; @@ -1258,7 +1275,7 @@ "openError", "multiSourceCreate", "XawWarning", "Cannot open file %s; %s", params, &num_params); } - } + } src->multi_src.length = 0; return (NULL); } Index: xc/lib/Xaw/Pixmap.c diff -u xc/lib/Xaw/Pixmap.c:3.15 xc/lib/Xaw/Pixmap.c:3.15.2.1 --- xc/lib/Xaw/Pixmap.c:3.15 Tue Sep 26 11:56:54 2000 +++ xc/lib/Xaw/Pixmap.c Fri Feb 9 15:45:09 2001 @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.15 2000/09/26 15:56:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.15.2.1 2001/02/09 20:45:09 paulo Exp $ */ #include #include @@ -437,7 +437,7 @@ cache = (XawCache **)bsearch(screen, xaw->elems, xaw->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); if (flags == FIND_SCREEN) return (*cache); @@ -446,7 +446,7 @@ cache = (XawCache **)bsearch((void *)colormap, (*cache)->elems, (*cache)->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); if (flags == FIND_COLORMAP) return (*cache); @@ -456,7 +456,7 @@ (*cache)->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); return (*cache); } Index: xc/lib/Xaw/Text.c diff -u xc/lib/Xaw/Text.c:3.40 xc/lib/Xaw/Text.c:3.40.2.1 --- xc/lib/Xaw/Text.c:3.40 Thu Dec 7 15:26:12 2000 +++ xc/lib/Xaw/Text.c Fri Feb 9 15:45:09 2001 @@ -1,4 +1,4 @@ -/* $TOG: Text.c /main/201 1998/06/24 11:53:44 kaleb $ */ +/* $Xorg: Text.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ /*********************************************************** @@ -70,7 +70,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.40 2000/12/07 20:26:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.40.2.1 2001/02/09 20:45:09 paulo Exp $ */ #include #include @@ -805,6 +805,7 @@ XtRealizeWidget(vbar); XtMapWidget(vbar); } + XtSetKeyboardFocus(vbar, (Widget)ctx); } /* @@ -863,6 +864,7 @@ XtRealizeWidget(hbar); XtMapWidget(hbar); } + XtSetKeyboardFocus(hbar, (Widget)ctx); } /* Index: xc/lib/Xaw/TextAction.c diff -u xc/lib/Xaw/TextAction.c:3.35 xc/lib/Xaw/TextAction.c:3.35.2.3 --- xc/lib/Xaw/TextAction.c:3.35 Thu Dec 7 15:26:12 2000 +++ xc/lib/Xaw/TextAction.c Fri Feb 23 16:30:07 2001 @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.35 2000/12/07 20:26:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.35.2.3 2001/02/23 21:30:07 paulo Exp $ */ #include #include @@ -185,6 +185,7 @@ static void Undo(Widget, XEvent*, String*, Cardinal*); #endif static void UpcaseWord(Widget, XEvent*, String*, Cardinal*); +static void DestroyFocusCallback(Widget, XtPointer, XtPointer); /* * External @@ -2835,12 +2836,34 @@ EndAction((TextWidget)w); } +/* This is kind of a hack, but, only one text widget can have focus at + * a time on one display. There is a problem in the implementation of the + * text widget, the scrollbars can not be adressed via editres, since they + * are not children of a subclass of composite. + * The focus variable is required to make sure only one text window will + * show a block cursor at one time. + */ +struct _focus { Display *display; Widget widget; }; +static struct _focus *focus; +static Cardinal num_focus; + +/*ARGSUSED*/ +static void +DestroyFocusCallback(Widget w, XtPointer user_data, XtPointer call_data) +{ + struct _focus *f = (struct _focus*)(user_data); + + if (f->widget == w) + f->widget = NULL; +} + /*ARGSUSED*/ static void TextFocusIn(Widget w, XEvent *event, String *p, Cardinal *n) { TextWidget ctx = (TextWidget)w; Bool display_caret = ctx->text.display_caret; + int i; if (event->xfocus.detail == NotifyPointer) return; @@ -2853,6 +2876,27 @@ ctx->text.hasfocus = TRUE; if (display_caret) EndAction(ctx); + + for (i = 0; i < num_focus; i++) + if (focus[i].display == XtDisplay(w)) + break; + if (i >= num_focus) { + focus = (struct _focus*) + XtRealloc((XtPointer)focus, sizeof(struct _focus) * (num_focus + 1)); + i = num_focus; + focus[i].widget = NULL; + focus[i].display = XtDisplay(w); + num_focus++; + } + if (focus[i].widget != w) { + Widget old = focus[i].widget; + + focus[i].widget = w; + if (old != NULL) + TextFocusOut(old, event, p, n); + XtAddCallback(w, XtNdestroyCallback, + DestroyFocusCallback, (XtPointer)&focus[i]); + } } /*ARGSUSED*/ @@ -2861,10 +2905,30 @@ { TextWidget ctx = (TextWidget)w; Bool display_caret = ctx->text.display_caret; + Widget shell; + Window window; + int i, revert; + + shell = w; + while (shell) { + if (XtIsShell(shell)) + break; + shell = XtParent(shell); + } - if (event->xfocus.detail == NotifyPointer) + for (i = 0; i < num_focus; i++) + if (focus[i].display == XtDisplay(w)) + break; + XGetInputFocus(XtDisplay(w), &window, &revert); + if ((XtWindow(shell) == window && + (i < num_focus && focus[i].widget == w)) + || event->xfocus.detail == NotifyPointer) return; + if (i < num_focus && focus[i].widget) + XtRemoveCallback(focus[i].widget, XtNdestroyCallback, + DestroyFocusCallback, (XtPointer)&focus[i]); + /* Let the input method know focus has left.*/ _XawImUnsetFocus(w); @@ -3110,6 +3174,8 @@ FD_ZERO(&fds); FD_SET(ConnectionNumber(XtDisplay(w)), &fds); (void)select(FD_SETSIZE, &fds, NULL, NULL, &tmval); + if (tmval.tv_usec != 500000) + usleep(40000); StartAction(ctx, NULL); #ifndef OLDXAW @@ -3342,8 +3408,9 @@ return; } else { - mult = mult * 10 + params[0][0] - '0'; - ctx->text.mult = ctx->text.mult * 10 + params[0][0] - '0'; + mult = mult * 10 + (params[0][0] - '0') * (mult < 0 ? -1 : 1); + ctx->text.mult = ctx->text.mult * 10 + (params[0][0] - '0') * + (mult < 0 ? -1 : 1); } if (mult != ctx->text.mult || mult >= 32767) { /* checks for overflow */ XBell(XtDisplay(w), 0); Index: xc/lib/Xaw/TextPop.c diff -u xc/lib/Xaw/TextPop.c:1.16 xc/lib/Xaw/TextPop.c:1.16.2.1 --- xc/lib/Xaw/TextPop.c:1.16 Thu May 18 12:29:52 2000 +++ xc/lib/Xaw/TextPop.c Fri Feb 9 15:45:10 2001 @@ -22,7 +22,7 @@ */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16.2.1 2001/02/09 20:45:10 paulo Exp $ */ /* * This file is broken up into three sections one dealing with @@ -837,7 +837,7 @@ static Bool DoSearch(struct SearchAndReplace *search) { - char msg[BUFSIZ]; + char msg[37]; Widget tw = XtParent(search->search_popup); XawTextPosition pos; XawTextScanDirection dir; @@ -875,11 +875,27 @@ GetString to get a tame version */ if (pos == XawTextSearchError) { - (void)XmuSnprintf(msg, sizeof(msg), - "Could not find string ``%s''.", - GetString(search->search_text)); + char *ptr; + int len; + + ptr = GetString(search->search_text); + len = strlen(ptr); + (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); + + ptr = strchr(msg, '\n'); + if (ptr != NULL || sizeof(msg) - 1 < len) { + if (ptr != NULL) + len = ptr - msg + 4; + else + len = strlen(msg); + + if (len < 4) + strcpy(msg, "..."); + else + strcpy(msg + len - 4, "..."); + } XawTextUnsetSelection(tw); - SetSearchLabels(search, msg, "", True); + SetSearchLabels(search, "Could not find string", msg, True); return (False); } @@ -1019,15 +1035,26 @@ if (new_pos == XawTextSearchError) { if (count == 0) { - char msg[BUFSIZ]; - - /* The Raw string in find.ptr may be WC I can't use here, - so I call GetString to get a tame version */ - - (void)XmuSnprintf(msg, sizeof(msg), - "Error: Could not find string ``%s''", - GetString(search->search_text)); - SetSearchLabels(search, msg, "", True); + char msg[37]; + char *ptr; + int len; + + ptr = GetString(search->search_text); + len = strlen(ptr); + (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); + ptr = strchr(msg, '\n'); + if (ptr != NULL || sizeof(msg) - 1 < len) { + if (ptr != NULL) + len = ptr - msg + 4; + else + len = strlen(msg); + + if (len < 4) + strcpy(msg, "..."); + else + strcpy(msg + len - 4, "..."); + } + SetSearchLabels(search, "Could not find string", msg, True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); @@ -1047,7 +1074,7 @@ XawTextGetSelectionPos(tw, &pos, &end_pos); if (search->selection_changed) { - SetSearchLabels(search, "Selection has been modified, aborting.", + SetSearchLabels(search, "Selection modified, aborting.", "", True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); @@ -1067,11 +1094,7 @@ } if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { - char msg[BUFSIZ]; - - (void)XmuSnprintf(msg, sizeof(msg), - "'%s' with '%s'", find.ptr, replace.ptr); - SetSearchLabels(search, "Error while replacing", msg, True); + SetSearchLabels(search, "Error while replacing.", "", True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); XawTextEnableRedisplay(tw); Index: xc/lib/Xaw/TextSrc.c diff -u xc/lib/Xaw/TextSrc.c:1.25 xc/lib/Xaw/TextSrc.c:1.25.2.1 --- xc/lib/Xaw/TextSrc.c:1.25 Tue Sep 26 11:56:55 2000 +++ xc/lib/Xaw/TextSrc.c Fri Feb 9 15:45:10 2001 @@ -21,7 +21,7 @@ */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.25 2000/09/26 15:56:55 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.25.2.1 2001/02/09 20:45:10 paulo Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. @@ -1022,9 +1022,9 @@ XtFree((XtPointer)entity); if (entity == anchor->entities) { if ((anchor->entities = enext) == NULL) { + eprev = NULL; anchor = XawTextSourceRemoveAnchor(w, anchor); entity = anchor ? anchor->entities : NULL; - eprev = NULL; } else eprev = entity = enext; @@ -1053,6 +1053,7 @@ XtFree((XtPointer)entity); anchor->cache = NULL; if (entity == anchor->entities) { + eprev = NULL; if ((anchor->entities = enext) == NULL) { if (i == 0) ++i; @@ -1069,7 +1070,6 @@ break; } anchor = src->textSrc.anchors[i]; - eprev = NULL; entity = anchor->entities; continue; } Index: xc/lib/Xft/Imakefile diff -u xc/lib/Xft/Imakefile:1.8 xc/lib/Xft/Imakefile:1.8.2.1 --- xc/lib/Xft/Imakefile:1.8 Fri Dec 15 12:12:52 2000 +++ xc/lib/Xft/Imakefile Mon Mar 12 11:03:23 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xft/Imakefile,v 1.8 2000/12/15 17:12:52 keithp Exp $ +XCOMM $XFree86: xc/lib/Xft/Imakefile,v 1.8.2.1 2001/03/12 16:03:23 keithp Exp $ #define DoNormalLib NormalLibXft #define DoSharedLib SharedLibXft @@ -31,7 +31,7 @@ DEFINES=-DXFT_DEFAULT_PATH=\"$(XFTCONFIG)\" $(FREETYPE2DEFINES) $(RENDERDEFINES) REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FREETYPE2LIB) -#ifdef Freetype2Dir +#if HasFreetype2 FT_HEADERS = XftFreetype.h FT_SRCS = xftdir.c xftfreetype.c xftglyphs.c xftrender.c FT_OBJS = xftdir.o xftfreetype.o xftglyphs.o xftrender.o Index: xc/lib/font/FreeType/ftfuncs.c diff -u xc/lib/font/FreeType/ftfuncs.c:1.16 xc/lib/font/FreeType/ftfuncs.c:1.16.2.1 --- xc/lib/font/FreeType/ftfuncs.c:1.16 Tue Nov 14 11:54:42 2000 +++ xc/lib/font/FreeType/ftfuncs.c Wed Feb 28 15:15:43 2001 @@ -1,6 +1,6 @@ /* Copyright (c) 1997 by Mark Leisher -Copyright (c) 1998-2000 by Juliusz Chroboczek +Copyright (c) 1998-2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.16 2000/11/14 16:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.16.2.1 2001/02/28 20:15:43 dawes Exp $ */ #ifndef FONT_MODULE #include @@ -1004,8 +1004,9 @@ /* Only pass the default glyph if there is no first index */ if(idx==0 && (code != 0 || - (font->mapping.encoding->first != 0 || - font->mapping.encoding->first_col != 0))) { + (font->mapping.encoding && + (font->mapping.encoding->first != 0 || + font->mapping.encoding->first_col != 0)))) { *g=0; return Successful; } else { @@ -1039,7 +1040,11 @@ idx=ttf_remap(code, &font->mapping); - if(idx==0 && code!=0) { + if(idx==0 && + (code!=0 || + (font->mapping.encoding && + (font->mapping.encoding->first != 0 || + font->mapping.encoding->first_col != 0)))) { *metrics=0; return Successful; } else { Index: xc/lib/font/FreeType/module/ftmodule.c diff -u xc/lib/font/FreeType/module/ftmodule.c:1.8 xc/lib/font/FreeType/module/ftmodule.c:1.8.2.1 --- xc/lib/font/FreeType/module/ftmodule.c:1.8 Tue Nov 14 11:54:44 2000 +++ xc/lib/font/FreeType/module/ftmodule.c Wed Feb 28 15:15:44 2001 @@ -23,7 +23,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.8 2000/11/14 16:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.8.2.1 2001/02/28 20:15:44 dawes Exp $ */ #include "misc.h" @@ -44,7 +44,7 @@ MODINFOSTRING1, MODINFOSTRING2, XF86_VERSION_CURRENT, - 1, 1, 8, + 1, 1, 9, ABI_CLASS_FONT, /* Font module */ ABI_FONT_VERSION, MOD_CLASS_FONT, Index: xc/lib/freetype2/Imakefile diff -u /dev/null xc/lib/freetype2/Imakefile:1.2.2.1 --- /dev/null Fri Mar 16 21:23:12 2001 +++ xc/lib/freetype2/Imakefile Mon Mar 12 11:03:23 2001 @@ -0,0 +1,105 @@ +XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.2.2.1 2001/03/12 16:03:23 keithp Exp $ + +#define IHaveSubdirs +#define PassCDebugFlags + +#define DoNormalLib NormalLibFreetype2 +#define DoSharedLib SharedLibFreetype2 +#define DoExtraLib SharedLibFreetype2 +#define DoDebugLib DebugLibFreetype2 +#define DoProfileLib ProfileLibFreetype2 +#define HasSharedData YES +#define LibName freetype +#define SoRev SOFREETYPE2REV +#define LibHeaders NO + +#include + +FREETYPETOP = $(TOP)/extras/freetype2 +FREETYPESRC = $(FREETYPETOP)/src +FREETYPEINC = $(FREETYPETOP)/include/freetype + +INCLUDES = $(FREETYPE2INCLUDES) -I$(FREETYPETOP)/src + +SUBDIRS=freetype + + + +SRCS_BASE = ftsystem.c ftinit.c ftdebug.c ftbase.c ftglyph.c ftbbox.c ftmm.c +OBJS_BASE = ftsystem.o ftinit.o ftdebug.o ftbase.o ftglyph.o ftbbox.o ftmm.o + +SRCS_AUTOHINT = autohint.c +OBJS_AUTOHINT = autohint.o + +SRCS_SFNT = sfnt.c +OBJS_SFNT = sfnt.o + +SRCS_CFF = cff.c +OBJS_CFF = cff.o + +SRCS_PSNAMES = psnames.c +OBJS_PSNAMES = psnames.o + +SRCS_PSAUX = psaux.c +OBJS_PSAUX = psaux.o + +SRCS_TRUETYPE = truetype.c +OBJS_TRUETYPE = truetype.o + +SRCS_TYPE1 = type1.c +OBJS_TYPE1 = type1.o + +SRCS_CID = type1cid.c +OBJS_CID = type1cid.o + +SRCS_RASTER = raster.c +OBJS_RASTER = raster.o + +SRCS_SMOOTH = smooth.c +OBJS_SMOOTH = smooth.o + +SRCS_WINFONTS = winfnt.c +OBJS_WINFONTS = winfnt.o + + +SRCS = $(SRCS_BASE) $(SRCS_AUTOHINT) $(SRCS_SFNT) $(SRCS_CFF) \ + $(SRCS_PSNAMES) $(SRCS_PSAUX) $(SRCS_TRUETYPE) $(SRCS_TYPE1) \ + $(SRCS_CID) $(SRCS_RASTER) $(SRCS_SMOOTH) $(SRCS_WINFONTS) + +OBJS = $(OBJS_BASE) $(OBJS_AUTOHINT) $(OBJS_SFNT) $(OBJS_CFF) \ + $(OBJS_PSNAMES) $(OBJS_PSAUX) $(OBJS_TRUETYPE) $(OBJS_TYPE1) \ + $(OBJS_CID) $(OBJS_RASTER) $(OBJS_SMOOTH) $(OBJS_WINFONTS) + +#include + +#if DoSharedLib && SharedDataSeparation +SpecialCObjectRule(sharedlib,NullParameter,$(SHLIBDEF)) +#endif + +#if 0 +MANSUFFIX = $(LIBMANSUFFIX) +InstallManPage(Freetype,$(LIBMANDIR)) +#endif + + +LinkSourceFile(ftsystem.c,$(FREETYPESRC)/base) +LinkSourceFile(ftinit.c,$(FREETYPESRC)/base) +LinkSourceFile(ftdebug.c,$(FREETYPESRC)/base) +LinkSourceFile(ftbase.c,$(FREETYPESRC)/base) +LinkSourceFile(ftglyph.c,$(FREETYPESRC)/base) +LinkSourceFile(ftbbox.c,$(FREETYPESRC)/base) +LinkSourceFile(ftmm.c,$(FREETYPESRC)/base) +LinkSourceFile(autohint.c,$(FREETYPESRC)/autohint) +LinkSourceFile(sfnt.c,$(FREETYPESRC)/sfnt) +LinkSourceFile(cff.c,$(FREETYPESRC)/cff) +LinkSourceFile(psnames.c,$(FREETYPESRC)/psnames) +LinkSourceFile(psaux.c,$(FREETYPESRC)/psaux) +LinkSourceFile(truetype.c,$(FREETYPESRC)/truetype) +LinkSourceFile(type1.c,$(FREETYPESRC)/type1) +LinkSourceFile(type1cid.c,$(FREETYPESRC)/cid) +LinkSourceFile(raster.c,$(FREETYPESRC)/raster) +LinkSourceFile(smooth.c,$(FREETYPESRC)/smooth) +LinkSourceFile(winfnt.c,$(FREETYPESRC)/winfonts) + + +DependTarget() Index: xc/lib/freetype2/freetype/Imakefile diff -u /dev/null xc/lib/freetype2/freetype/Imakefile:1.2.2.1 --- /dev/null Fri Mar 16 21:23:12 2001 +++ xc/lib/freetype2/freetype/Imakefile Mon Mar 12 11:03:23 2001 @@ -0,0 +1,56 @@ +XCOMM $XFree86: xc/lib/freetype2/freetype/Imakefile,v 1.2.2.1 2001/03/12 16:03:23 keithp Exp $ + +#define IHaveSubdirs +#define PassCDebugFlags + +SUBDIRS=config cache internal + +FREETYPETOP = $(TOP)/extras/freetype2 +FREETYPESRC = $(FREETYPETOP)/src +FREETYPEINC = $(FREETYPETOP)/include/freetype + +HEADERS= \ + freetype.h \ + ftbbox.h \ + ftcache.h \ + fterrors.h \ + ftglyph.h \ + ftimage.h \ + ftlist.h \ + ftmac.h \ + ftmm.h \ + ftmodule.h \ + ftnames.h \ + ftoutln.h \ + ftrender.h \ + ftsynth.h \ + ftsystem.h \ + fttypes.h \ + t1tables.h \ + ttnameid.h \ + tttables.h \ + tttags.h + +BuildIncludes($(HEADERS),freetype2/freetype,../..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/freetype2/freetype,$(INSTINCFLAGS)) + +LinkSourceFile(freetype.h,$(FREETYPEINC)) +LinkSourceFile(ftbbox.h,$(FREETYPEINC)) +LinkSourceFile(ftcache.h,$(FREETYPEINC)) +LinkSourceFile(fterrors.h,$(FREETYPEINC)) +LinkSourceFile(ftglyph.h,$(FREETYPEINC)) +LinkSourceFile(ftimage.h,$(FREETYPEINC)) +LinkSourceFile(ftlist.h,$(FREETYPEINC)) +LinkSourceFile(ftmac.h,$(FREETYPEINC)) +LinkSourceFile(ftmm.h,$(FREETYPEINC)) +LinkSourceFile(ftmodule.h,$(FREETYPEINC)) +LinkSourceFile(ftnames.h,$(FREETYPEINC)) +LinkSourceFile(ftoutln.h,$(FREETYPEINC)) +LinkSourceFile(ftrender.h,$(FREETYPEINC)) +LinkSourceFile(ftsynth.h,$(FREETYPEINC)) +LinkSourceFile(ftsystem.h,$(FREETYPEINC)) +LinkSourceFile(fttypes.h,$(FREETYPEINC)) +LinkSourceFile(t1tables.h,$(FREETYPEINC)) +LinkSourceFile(ttnameid.h,$(FREETYPEINC)) +LinkSourceFile(tttables.h,$(FREETYPEINC)) +LinkSourceFile(tttags.h,$(FREETYPEINC)) Index: xc/lib/freetype2/freetype/cache/Imakefile diff -u /dev/null xc/lib/freetype2/freetype/cache/Imakefile:1.1.2.1 --- /dev/null Fri Mar 16 21:23:12 2001 +++ xc/lib/freetype2/freetype/cache/Imakefile Mon Mar 12 11:03:23 2001 @@ -0,0 +1,23 @@ +XCOMM $XFree86: xc/lib/freetype2/freetype/cache/Imakefile,v 1.1.2.1 2001/03/12 16:03:23 keithp Exp $ + +FREETYPETOP = $(TOP)/extras/freetype2 +FREETYPESRC = $(FREETYPETOP)/src +FREETYPEINC = $(FREETYPETOP)/include/freetype + +HEADERS= \ + ftcchunk.h \ + ftcglyph.h \ + ftcimage.h \ + ftcmanag.h \ + ftcsbits.h \ + ftlru.h + +BuildIncludes($(HEADERS),freetype2/freetype/cache,../../..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/freetype2/freetype/cache,$(INSTINCFLAGS)) + +LinkSourceFile(ftcchunk.h,$(FREETYPEINC)/cache) +LinkSourceFile(ftcglyph.h,$(FREETYPEINC)/cache) +LinkSourceFile(ftcimage.h,$(FREETYPEINC)/cache) +LinkSourceFile(ftcmanag.h,$(FREETYPEINC)/cache) +LinkSourceFile(ftcsbits.h,$(FREETYPEINC)/cache) +LinkSourceFile(ftlru.h,$(FREETYPEINC)/cache) Index: xc/lib/freetype2/freetype/config/Imakefile diff -u /dev/null xc/lib/freetype2/freetype/config/Imakefile:1.1.2.1 --- /dev/null Fri Mar 16 21:23:12 2001 +++ xc/lib/freetype2/freetype/config/Imakefile Mon Mar 12 11:03:24 2001 @@ -0,0 +1,19 @@ +XCOMM $XFree86: xc/lib/freetype2/freetype/config/Imakefile,v 1.1.2.1 2001/03/12 16:03:24 keithp Exp $ + +FREETYPETOP = $(TOP)/extras/freetype2 +FREETYPESRC = $(FREETYPETOP)/src +FREETYPEINC = $(FREETYPETOP)/include/freetype + +HEADERS= \ + ftbuild.h \ + ftconfig.h \ + ftmodule.h \ + ftoption.h + +BuildIncludes($(HEADERS),freetype2/freetype/config,../../..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/freetype2/freetype/config,$(INSTINCFLAGS)) + +LinkSourceFile(ftbuild.h,$(FREETYPEINC)/config) +LinkSourceFile(ftconfig.h,$(FREETYPEINC)/config) +LinkSourceFile(ftmodule.h,$(FREETYPEINC)/config) +LinkSourceFile(ftoption.h,$(FREETYPEINC)/config) Index: xc/lib/freetype2/freetype/internal/Imakefile diff -u /dev/null xc/lib/freetype2/freetype/internal/Imakefile:1.1.2.1 --- /dev/null Fri Mar 16 21:23:13 2001 +++ xc/lib/freetype2/freetype/internal/Imakefile Mon Mar 12 11:03:24 2001 @@ -0,0 +1,49 @@ +XCOMM $XFree86: xc/lib/freetype2/freetype/internal/Imakefile,v 1.1.2.1 2001/03/12 16:03:24 keithp Exp $ + +FREETYPETOP = $(TOP)/extras/freetype2 +FREETYPESRC = $(FREETYPETOP)/src +FREETYPEINC = $(FREETYPETOP)/include/freetype + +HEADERS= \ + autohint.h \ + fnttypes.h \ + ftcalc.h \ + ftdebug.h \ + ftdriver.h \ + ftextend.h \ + ftmemory.h \ + ftobjs.h \ + ftstream.h \ + internal.h \ + psaux.h \ + psnames.h \ + sfnt.h \ + t1errors.h \ + t1types.h \ + t2errors.h \ + t2types.h \ + tterrors.h \ + tttypes.h + +BuildIncludes($(HEADERS),freetype2/freetype/internal,../../..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/freetype2/freetype/internal,$(INSTINCFLAGS)) + +LinkSourceFile(autohint.h,$(FREETYPEINC)/internal) +LinkSourceFile(fnttypes.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftcalc.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftdebug.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftdriver.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftextend.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftmemory.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftobjs.h,$(FREETYPEINC)/internal) +LinkSourceFile(ftstream.h,$(FREETYPEINC)/internal) +LinkSourceFile(internal.h,$(FREETYPEINC)/internal) +LinkSourceFile(psaux.h,$(FREETYPEINC)/internal) +LinkSourceFile(psnames.h,$(FREETYPEINC)/internal) +LinkSourceFile(sfnt.h,$(FREETYPEINC)/internal) +LinkSourceFile(t1errors.h,$(FREETYPEINC)/internal) +LinkSourceFile(t1types.h,$(FREETYPEINC)/internal) +LinkSourceFile(t2errors.h,$(FREETYPEINC)/internal) +LinkSourceFile(t2types.h,$(FREETYPEINC)/internal) +LinkSourceFile(tterrors.h,$(FREETYPEINC)/internal) +LinkSourceFile(tttypes.h,$(FREETYPEINC)/internal) Index: xc/programs/Xserver/Xext/panoramiX.c diff -u xc/programs/Xserver/Xext/panoramiX.c:3.23 xc/programs/Xserver/Xext/panoramiX.c:3.23.2.1 --- xc/programs/Xserver/Xext/panoramiX.c:3.23 Tue Sep 26 11:57:02 2000 +++ xc/programs/Xserver/Xext/panoramiX.c Thu Mar 8 21:26:52 2001 @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.23 2000/09/26 15:57:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.23.2.1 2001/03/09 02:26:52 keithp Exp $ */ #define NEED_REPLIES #include @@ -610,6 +610,10 @@ ProcVector[X_FreeColors] = PanoramiXFreeColors; ProcVector[X_StoreColors] = PanoramiXStoreColors; ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; + +#ifdef RENDER + PanoramiXRenderInit (); +#endif return; } Index: xc/programs/Xserver/Xext/panoramiX.h diff -u xc/programs/Xserver/Xext/panoramiX.h:1.4 xc/programs/Xserver/Xext/panoramiX.h:1.4.2.1 --- xc/programs/Xserver/Xext/panoramiX.h:1.4 Fri Jan 21 20:59:03 2000 +++ xc/programs/Xserver/Xext/panoramiX.h Thu Mar 8 21:26:52 2001 @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.4 2000/01/22 01:59:03 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.4.2.1 2001/03/09 02:26:52 keithp Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ @@ -56,6 +56,11 @@ struct { Bool shared; } pix; +#ifdef RENDER + struct { + Bool root; + } pict; +#endif char raw_data[4]; } u; } PanoramiXRes; Index: xc/programs/Xserver/dix/events.c diff -u xc/programs/Xserver/dix/events.c:3.35 xc/programs/Xserver/dix/events.c:3.35.2.1 --- xc/programs/Xserver/dix/events.c:3.35 Sun Oct 22 17:12:09 2000 +++ xc/programs/Xserver/dix/events.c Fri Feb 9 15:45:14 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.35 2000/10/22 21:12:09 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.35.2.1 2001/02/09 20:45:14 paulo Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -2783,6 +2783,44 @@ if (deactivateGrab) (*keybd->DeactivateGrab)(keybd); } + +#ifdef XKB +/* This function is used to set the key pressed or key released state - + this is only used when the pressing of keys does not cause + CoreProcessKeyEvent to be called, as in for example Mouse Keys. +*/ +void +FixKeyState (xE, keybd) + register xEvent *xE; + register DeviceIntPtr keybd; +{ + int key, bit; + register BYTE *kptr; + register KeyClassPtr keyc = keybd->key; + + key = xE->u.u.detail; + kptr = &keyc->down[key >> 3]; + bit = 1 << (key & 7); +#ifdef DEBUG + if ((xkbDebugFlags&0x4)&& + ((xE->u.u.type==KeyPress)||(xE->u.u.type==KeyRelease))) { + ErrorF("FixKeyState: Key %d %s\n",key, + (xE->u.u.type==KeyPress?"down":"up")); + } +#endif + switch (xE->u.u.type) + { + case KeyPress: + *kptr |= bit; + break; + case KeyRelease: + *kptr &= ~bit; + break; + default: + FatalError("Impossible keyboard event"); + } +} +#endif void #ifdef XKB Index: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man diff -u xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man:1.2 xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man:1.2.2.1 --- xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man:1.2 Mon Dec 4 16:01:00 2000 +++ xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man Wed Feb 28 16:44:20 2001 @@ -1,8 +1,8 @@ -.\" $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.2 2000/12/04 21:01:00 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.2.2.1 2001/02/28 21:44:20 dawes Exp $ .\" .TH Xfbdev 1 .SH NAME -Xvesa \- Linux framebuffer device tiny X server +Xfbdev \- Linux framebuffer device tiny X server .SH SYNOPSIS .B Xfbdev .RI [ :display ] Index: xc/programs/Xserver/hw/xfree86/XF86Config.cpp diff -u xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.13 xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.13.2.2 --- xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.13 Mon Dec 11 15:18:01 2000 +++ xc/programs/Xserver/hw/xfree86/XF86Config.cpp Thu Mar 15 18:35:36 2001 @@ -1,7 +1,7 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.cpp,v 1.13 2000/12/11 20:18:01 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.cpp,v 1.13.2.2 2001/03/15 23:35:36 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH XF86Config __filemansuffix__ "Version 4.0.2" "XFree86" +.TH XF86Config __filemansuffix__ "Version 4.0.3" "XFree86" .SH NAME XF86Config - Configuration File for XFree86 .SH DESCRIPTION @@ -929,6 +929,11 @@ server to determine if video modes are within the specifications of the monitor. This information should be available in the monitor's handbook. If this entry is omitted, a default range of 43-72Hz is used. +.TP 7 +.BI "DisplaySize " "width height" +This optional entry gives the width and height, in millimetres, of the +picture area of the monitor. If given this is used to calculate the +horizontal and vertical pitch (DPI) of the screen. .TP 7 .BI "Gamma " "gamma-value" .TP 7 Index: xc/programs/Xserver/hw/xfree86/XFree86.cpp diff -u xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.4 xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.4.2.1 --- xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.4 Mon Dec 11 15:29:50 2000 +++ xc/programs/Xserver/hw/xfree86/XFree86.cpp Thu Mar 15 13:59:13 2001 @@ -1,96 +1,47 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.cpp,v 1.4 2000/12/11 20:29:50 dawes Exp $ -.TH XFree86 1 "Version 4.0.2" "XFree86" +.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.cpp,v 1.4.2.1 2001/03/15 18:59:13 dawes Exp $ +.TH XFree86 1 "Version 4.0.3" "XFree86" .SH NAME XFree86 - X11R6 X server .SH SYNOPSIS .B XFree86 [:display] [option ...] .SH DESCRIPTION -XFree86 is an X servers for UNIX-like OSs on Intel x86 and other platforms. +XFree86 is an X server that was originally designed for UNIX and UNIX-like +operating systems running on Intel x86 hardware. It now runs on a wider +range of hardware and OS platforms. +.PP This work is derived from .I "X386\ 1.2" which was contributed to X11R5 by Snitily Graphics Consulting Service. -The current XFree86 release is based on X11R6.3. -The XFree86 X server architecture was redesigned for the 4.0 release, and -it includes among other things a loadable module system donated by -Metro Link, Inc. +The current XFree86 release is based on X11R6.3. The XFree86 X server +architecture was redesigned for the 4.0 release, and it includes among +other things a loadable module system donated by Metro Link, Inc. .SH CONFIGURATIONS .PP .I XFree86 -operates under the following operating systems: -.RS .5i -.na +operates under a wide range of operating systems and hardware platforms. +The Intel x86 (IA32) architecture is the most widely supported hardware +platform. Other hardware platforms include Compaq Alpha, Intel IA64, +SPARC and PowerPC. The most widely supported operating systems are the +free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD and +OpenBSD. Commercial UNIX operating systems such as Solaris (x86) and +UnixWare are also supported. Other supported operating systems include +LynxOS, and GNU Hurd. Darwin and Mac OS X are supported with the +Xdarwin(1) X server. Win32/Cygwin is supported with the XWin X server. .PP --- SVR3.2: SCO 3.2.2, 3.2.4, ISC 3.x, 4.x -.br --- SVR4.0: ESIX, Microport, Dell, UHC, Consensys, MST, ISC, AT&T, NCR -.br --- SVR4.2: Consensys, Univel (UnixWare) -.br --- Solaris (x86) 2.5, 2.6 -.br --- FreeBSD 2.1.x, 2.2.x, 3.0-current -.br --- NetBSD 1.2, 1.3 -.br --- OpenBSD -.ig -.br --- BSD/386 version 1.1 and BSD/OS 2.0 -.br --- Mach (from CMU) -.. -.br --- Linux -.ig -.br --- Amoeba version 5.1 -.br --- Minix-386vm version 1.6.25.1 -.. -.br --- LynxOS AT versions 2.2.1, 2.3.0 and 2.4.0, LynxOS microSPARC 2.4.0 -.ad -.RE -.PP .SH "NETWORK CONNECTIONS" \fIXFree86\fP supports connections made using the following reliable byte-streams: .TP 4 .I "Local" -\fIXFree86\fP supports local connections via Streams pipe via various mechanisms, -using the following paths (\fIn\fP represents the display number): -.sp .5v -.in 8 -.nf -/dev/X/server.\fBn\fR (SVR3 and SVR4) -/dev/X/Nserver.\fBn\fR (SVR4) -.ig -/tmp/.X11-unix/X\fBn\fR (ISC SVR3) -.. -/dev/X\fBn\fRS and /dev/X\fBn\fRR (SCO SVR3) -.fi -.in -.sp .5v -On SVR4.0.4, if the \fIAdvanced Compatibility Package\fP -is installed, and in SVR4.2, \fIXFree86\fP supports local connections -from clients for SCO XSight/ODT, and (with modifications to the binary) -clients for ISC SVR3. +On most platforms, the "Local" connection type is a UNIX-domain socket. +On some System V platforms, the "local" connection types also include +STREAMS pipes, named pipes, and some other mechanisms. .TP 4 -.I "Unix Domain" -\fIXFree86\fP uses \fI/tmp/.X11-unix/X\fBn\fR as the filename for the socket, -where \fIn\fP is the display number. -.TP 4 .I TCP\/IP -\fIXFree86\fP listens on port htons(6000+\fIn\fP), where \fIn\fP is the display -number. -.ig -.TP 4 -.I "Amoeba RPC" -This is the default communication medium used under native Amoeba. -Note that under Amoeba, the server should be started -with a ``\fIhostname\fP:\fIdisplaynumber\fP'' argument. -.. +\fIXFree86\fP listens on port 6000+\fIn\fP, where \fIn\fP is the display +number. This connection type can be disabled with the \fB\-nolisten\fP +option (see the Xserver(1) man page for details). .SH "ENVIRONMENT VARIABLES" For operating systems that support local connections other than Unix Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying the order @@ -104,16 +55,16 @@ .PP The \fIXLOCAL\fP environment variable should contain a list of one more more of the following: -.sp .5v -.in 8 +.PP +.RS 8 .nf NAMED PTS SCO ISC .fi -.in -.sp .5v +.RE +.PP which represent SVR4 Named Streams pipe, Old-style USL Streams pipe, SCO XSight Streams pipe, and ISC Streams pipe, respectively. You can select a single mechanism (e.g. \fIXLOCAL=NAMED\fP), or an ordered @@ -132,195 +83,424 @@ manual page, \fIXFree86\fP accepts the following command line switches: .TP 8 .B vt\fIXX\fP -\fIXX\fP specifies the Virtual Terminal device number which -\fIXFree86\fP will use. Without this option, \fIXFree86\fP will pick the first +\fIXX\fP specifies the Virtual Terminal device number which \fIXFree86\fP +will use. Without this option, \fIXFree86\fP will pick the first available Virtual Terminal that it can locate. This option applies only -to SVR3, SVR4, Linux, and BSD OSs with the `syscons' or `pcvt' driver. +to platforms such as Linux, BSD, SVR3 and SVR4, that have virtual terminal +support. +.TP +.B \-allowMouseOpenFail +Allow the server to start up even if the mouse device can't be opened +or initialised. This is equivalent to the +.B AllowMouseOpenFail +XF86Config(__filemansuffix__) file option. .TP 8 -.B -crt /dev/tty\fIXX\fP -SCO only. This is the same as the \fBvt\fP option, and is provided for -compatibility with the native SCO X server. +.B \-allowNonLocalModInDev +Allow changes to keyboard and mouse settings from non-local clients. +By default, connections from non-local clients are not allowed to do +this. This is equivalent to the +.B AllowNonLocalModInDev +XF86Config(__filemansuffix__) file option. .TP 8 -.B \-probeonly -Causes the server to exit after the device probing stage. The XF86Config file -is still used when this option is given, so information that can be -auto-detected should be commented out. +.B \-allowNonLocalXvidtune +Make the VidMode extension available to remote clients. This allows +the xvidtune client to connect from another host. This is equivalent +to the +.B AllowNonLocalXvidtune +XF86Config(__filemansuffix__) file option. By default non-local +connections are not allowed. .TP 8 -.B \-quiet -Suppress most informational messages at startup. +.B \-bgamma \fIvalue\fP +Set the blue gamma correction. \fIvalue\fP must be between 0.1 and 10. +The default is 1.0. Not all drivers support this. See also the +.BR \-gamma , +.BR \-rgamma , +and +.B \-ggamma +options. .TP 8 .B \-bpp \fIn\fP -No longer supported. Use \fB\-depth\fP to set the color depth, and -use \fB\-fbbpp\fP if you really need to force a non-default -framebuffer (hardware) pixel format. +No longer supported. Use \fB\-depth\fP to set the color depth, and use +\fB\-fbbpp\fP if you really need to force a non-default framebuffer +(hardware) pixel format. +.TP +.B \-configure +When this option is specified, the X server loads all video driver +modules, probes for available hardware, and writes out an initial +XF86Config(__filemansuffix__) file based on what was detected. This +option currently has some problems on some platforms, but in most cases +it is a good way to bootstrap the configuration process. This option +is only available when the server is run as root (i.e, with real-uid +0). .TP 8 +.B \-crt /dev/tty\fIXX\fP +SCO only. This is the same as the \fBvt\fP option, and is provided for +compatibility with the native SCO X server. +.TP 8 .B \-depth \fIn\fP -Sets the default color depth. Legal values are 8, 15, 16, and 24. -Not all servers support all values. +Sets the default color depth. Legal values are 1, 4, 8, 15, 16, and +24. Not all drivers support all values. .TP 8 -.B \-fbbpp \fIn\fP -Sets the number of framebuffer bits per pixel. You should only set -this if you're sure it's necessary; normally the server can deduce the -correct value from \fB\-depth\fP above. Useful if you want to run a -depth 24 configuration with a 24 bpp framebuffer rather than the -(possibly default) 32 bpp framebuffer. Legal values are 8, 16, 24, -32. Not all servers support all values. +.B \-disableModInDev +Disable dynamic modification of input device settings. This is equivalent +to the +.B DisableModInDev +XF86Config(__filemansuffix__) file option. .TP 8 -.B \-weight \fInnn\fP -Set RGB weighting at 16 bpp. The default is 565. This applies -only to those servers which support 16 bpp. +.B \-disableVidMode +Disable the the parts of the VidMode extension (used by the xvidtune +client) that can be used to change the video modes. This is equivalent +to the +.B DisableVidModeExtension +XF86Config(__filemansuffix__) file option. +.TP 8 +.B \-fbbpp \fIn\fP +Sets the number of framebuffer bits per pixel. You should only set this +if you're sure it's necessary; normally the server can deduce the correct +value from \fB\-depth\fP above. Useful if you want to run a depth 24 +configuration with a 24 bpp framebuffer rather than the (possibly default) +32 bpp framebuffer (or vice versa). Legal values are 1, 8, 16, 24, 32. +Not all drivers support all values. .TP 8 .B \-flipPixels Swap the default values for the black and white pixels. .TP 8 -.B \-disableVidMode -Disable the the parts of the VidMode extension used by the xvidtune client -that can be used to change the video modes. +.B \-gamma \fIvalue\fP +Set the gamma correction. \fIvalue\fP must be between 0.1 and 10. The +default is 1.0. This value is applied equally to the R, G and B values. +Those values can be set independently with the +.BR \-rgamma , +.BR \-bgamma , +and +.B \-ggamma +options. Not all drivers support this. .TP 8 -.B \-allowNonLocalXvidtune -Allow the xvidtune client to connect from another host. By default non-local -connections are not allowed. +.B \-ggamma \fIvalue\fP +Set the green gamma correction. \fIvalue\fP must be between 0.1 and +10. The default is 1.0. Not all drivers support this. See also the +.BR \-gamma , +.BR \-rgamma , +and +.B \-bgamma +options. +.TP 8 +.B \-ignoreABI +The X server checks the ABI revision levels of each module that it loads. +It will normally refuse to load modules with ABI revisions that are newer +than the server's. This is because such modules might use interfaces that +the server does not have. When this option is specified, mismatches like +this are downgraded from fatal errors to warnings. This option should +be used with care. .TP 8 -.B \-disableModInDev -Disable dynamic modification of input device settings. +.B \-keeptty +Prevent the server from detaching its initial controlling terminal. +This option is only useful when debugging the server. Not all platforms +support (or can use) this option. +.TP 8 +.B \-keyboard \fIkeyboard-name\fP +Use the XF86Config(__filemansuffix__) file +.B InputDevice +section called +.I keyboard-name +as the core keyboard. +By default the core keyboard input device referenced by the default +.B Layout +section are used, or the first relevant +.B InputDevice +section when there are no +.B Layout +sections. +.TP 8 +.B \-layout \fIlayout-name\fP +Use the XF86Config(__filemansuffix__) file +.B Layout +section called +.IR layout-name . +By default the first +.B Layout +section is used. +.TP 8 +.B \-logfile \fIfilename\fP +Use the file called +.I filenameg +as the X server log file. The default log file is +.B __logdir__/XFree86.\fIn\fP.log +on most platforms, where +.I n +is the display number of the X server. The default may be in a different +directory on some platforms. This option is only available when the +server is run as root (i.e, with real-uid 0). +.TP 8 +.BR \-logverbose " [\fIn\fP]" +Sets the verbosity level for information printed to the X server log +file. If the +.I n +value isn't supplied, each occurrance of this option increments the log +file verbosity level. When the +.I n +value is supplied, the log file verbosity level is set to that value. +The default log file verbosity level is 3. +.TP 8 +.B \-modulepath \fIsearchpath\fP +Set the module search path to +.IR searchpath . +.I searchpath +is a comma separated list of directories to search for X server modules. +This option is only available when the server is run as root (i.e, with +real-uid 0). +.TP 8 +.B \-nosilk +Disable Silken Mouse support. +.TP 8 +.B \-pixmap24 +Set the internal pixmap format for depth 24 pixmaps to 24 bits per pixel. +The default is usually 32 bits per pixel. There is normally little +reason to use this option. Some client applications don't like this +pixmap format, even though it is a perfectly legal format. +This is equvalent to the +.B Pixmap +XF86Config(__filemansuffix__) file option. +.TP 8 +.B \-pixmap32 +Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel. +This is usually the default. +This is equvalent to the +.B Pixmap +XF86Config(__filemansuffix__) file option. +.TP 8 +.B \-pointer \fIpointer-name\fP +Use the XF86Config(__filemansuffix__) file +.B InputDevice +section called +.I pointer-name +as the core pointer. +By default the core pointer input device referenced by the default +.B Layout +section are used, or the first relevant +.B InputDevice +section when there are no +.B Layout +sections. .TP 8 -.B \-allowNonLocalModInDev -Allow changes to keyboard and mouse settings from non-local clients. -By default, connections from non-local clients are not allowed to do this. -.TP -.B \-allowMouseOpenFail -Allow the server to start up even if the mouse device can't be opened or -initialised. +.B \-probeonly +Causes the server to exit after the device probing stage. The XF86Config +file is still used when this option is given, so information that can +be auto-detected should be commented out. .TP 8 -.B \-gamma \fIvalue\fP -Set the gamma correction. \fIvalue\fP must be between 0.1 and 10. The -default is 1.0 -This value is applied equally to the R, G and B values. Not all servers -support this. +.B \-quiet +Suppress most informational messages at startup. The verbosity level +is set to zero. .TP 8 .B \-rgamma \fIvalue\fP -Set the red gamma correction. \fIvalue\fP must be between 0.1 and 10. The -default is 1.0 -Not all servers support this. +Set the red gamma correction. \fIvalue\fP must be between 0.1 and 10. +The default is 1.0. Not all drivers support this. See also the +.BR \-gamma , +.BR \-bgamma , +and +.B \-ggamma +options. +.TP 8 +.B \-scanpci +When this option is specified, the X server scans the PCI bus, and prints +out some information about each device that was detected. See also +scanpci(1) and pcitweak(1). +.TP 8 +.B \-screen \fIscreen-name\fP +Use the XF86Config(__filemansuffix__) file +.B Screen +section called +.IR screen-name . +By default the screens referenced by the default +.B Layout +section are used, or the first +.B Screen +section when there are no +.B Layout +sections. .TP 8 -.B \-ggamma \fIvalue\fP -Set the green gamma correction. \fIvalue\fP must be between 0.1 and 10. The -default is 1.0 -Not all servers support this. -.TP 8 -.B \-bgamma \fIvalue\fP -Set the blue gamma correction. \fIvalue\fP must be between 0.1 and 10. The -default is 1.0 -Not all servers support this. -.TP 8 .B \-showconfig -Print out the server version, patchlevel, and a list of screen drivers -configured in the server. +This is the same as the +.B \-version +option, and is included for compatibilty reasons. It may be removed in +a future release, so the +.B \-version +options hould be used instead. +.TP 8 +.B \-weight \fInnn\fP +Set RGB weighting at 16 bpp. The default is 565. This applies only to +those drivers which support 16 bpp. .TP 8 -.B \-verbose -Multiple occurrences of this flag increase the amount of information printed on -stderr (more than the default). +.BR \-verbose " [\fIn\fP]" +Sets the verbosity level for information printed on stderr. If the +.I n +value isn't supplied, each occurrance of this option increments the +verbosity level. When the +.I n +value is supplied, the verbosity level is set to that value. The default +verbosity level is 1. .TP 8 .B \-version -Same as \fB\-showconfig\fP. +Print out the server version, patchlevel, release date, the operating +system/platform it was built on, and whether it includes module loader +support. .TP 8 .B \-xf86config \fIfile\fP Read the server configuration from \fIfile\fP. This option will work for any file when the server is run as root (i.e, with real-uid 0), or for files relative to a directory in the config search path for all -other users. -.TP 8 -.B \-keeptty -Prevent the server from detaching its initial controlling terminal. This -option is only useful when debugging the server. +other users. .SH "KEYBOARD" Multiple key presses recognized directly by \fIXFree86\fP are: .TP 8 .B Ctrl+Alt+Backspace -Immediately kills the server -- no questions asked. (Can be disabled by -specifying "DontZap" in the \fBServerFlags\fP section of the XF86Config file.) +Immediately kills the server -- no questions asked. This can be disabled +with the +.B DontZap +XF86Config(__filemansuffix__) file option. .TP 8 .B Ctrl+Alt+Keypad-Plus -Change video mode to next one specified in the configuration file, -(increasing video resolution order). +Change video mode to next one specified in the configuration file. +This can be disabled with the +.B DontZoom +XF86Config(__filemansuffix__) file option. .TP 8 .B Ctrl+Alt+Keypad-Minus -Change video mode to previous one specified in the configuration file, -(decreasing video resolution order). +Change video mode to previous one specified in the configuration file. +This can be disabled with the +.B DontZoom +XF86Config(__filemansuffix__) file option. .TP 8 .B Ctrl+Alt+F1...F12 -For BSD systems using the syscons driver and Linux, these keystroke -combinations are used to switch to Virtual -Console 1 through 12. +For BSD and Linux systems with virtual terminal support, these keystroke +combinations are used to switch to Virtual Console 1 through 12. .SH SETUP .I XFree86 uses a configuration file called \fBXF86Config\fP for its initial setup. Refer to the -.I XF86Config(4/5) -manual page for more information. +.I XF86Config(__filemansuffix__) +manual page for information about the +format of this file. .SH FILES +The X server config file can be found in a range of locations. These +are documented fully in the +.I XF86Config(__filemansuffix__) +manual page. The most commonly used locations are shown here. .TP 30 -/etc/XF86Config +/etc/X11/XF86Config Server configuration file .TP 30 -/etc/X11/XF86Config +/etc/X11/XF86Config-4 Server configuration file .TP 30 -/usr/X11R6/etc/XF86Config +/etc/XF86Config Server configuration file .TP 30 -/lib/X11/XF86Config.\fIhostname\fP +__projectroot__/etc/XF86Config Server configuration file .TP 30 -/lib/X11/XF86Config +__projectroot__/lib/X11/XF86Config Server configuration file .TP 30 -/bin/\(** +__logdir__/XFree86.\fIn\fP.log +Server log file for display \fIn\fP. +.TP 30 +__projectroot__/bin/\(** Client binaries .TP 30 -/include/\(** +__projectroot__/include/\(** Header files .TP 30 -/lib/\(** +__projectroot__/lib/\(** Libraries .TP 30 -/lib/X11/fonts/\(** +__projectroot__/lib/X11/fonts/\(** Fonts .TP 30 -/lib/X11/rgb.txt +__projectroot__/lib/X11/rgb.txt Color names to RGB mapping .TP 30 -/lib/X11/XErrorDB +__projectroot__/lib/X11/XErrorDB Client error message database .TP 30 -/lib/X11/app-defaults/\(** +__projectroot__/lib/X11/app-defaults/\(** Client resource specifications .TP 30 -/man/man?/\(** +__projectroot__/man/man?/\(** Manual pages .TP 30 /etc/X\fIn\fP.hosts Initial access control list for display \fIn\fP -.LP -Note: refers to the root of the X11 install tree. .SH "SEE ALSO" X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), -XF86Config(__filemansuffix__), xf86config(1), xf86cfg(1), xvidtune(1) +XF86Config(__filemansuffix__), xf86config(1), xf86cfg(1), xvidtune(1), +apm(__drivermansuffix__), +ati(__drivermansuffix__), +chips(__drivermansuffix__), +cirrus(__drivermansuffix__), +cyrix(__drivermansuffix__), +fbdev(__drivermansuffix__), +glide(__drivermansuffix__), +glint(__drivermansuffix__), +i128(__drivermansuffix__), +i740(__drivermansuffix__), +i810(__drivermansuffix__), +imstt(__drivermansuffix__), +mga(__drivermansuffix__), +neomagic(__drivermansuffix__), +nv(__drivermansuffix__), +r128(__drivermansuffix__), +rendition(__drivermansuffix__), +s3virge(__drivermansuffix__), +siliconmotion(__drivermansuffix__), +sis(__drivermansuffix__), +sunbw2(__drivermansuffix__), +suncg14(__drivermansuffix__), +suncg3(__drivermansuffix__), +suncg6(__drivermansuffix__), +sunffb(__drivermansuffix__), +sunleo(__drivermansuffix__), +suntcx(__drivermansuffix__), +tdfx(__drivermansuffix__), +tga(__drivermansuffix__), +trident(__drivermansuffix__), +tseng(__drivermansuffix__), +v4l(__drivermansuffix__), +vesa(__drivermansuffix__), +vga(__drivermansuffix__), +.br +README +.IR , +.br +RELNOTES +.IR , +.br +README.mouse +.IR , +.br +README.DRI +.IR , +.br +Status +.IR , +.br +Install +.IR . + .SH AUTHORS +XFree86 has many contributors world wide. The names of most of them +can be found in the documentation, CHANGELOG files in the source tree, +and in the actual source code. .PP -For X11R5, \fIXF86 1.2\fP was provided by: -.TP 8 -Thomas Roell, \fIroell@informatik.tu-muenchen.de\fP -TU-Muenchen: Server and SVR4 stuff -.TP 8 -Mark W. Snitily, \fImark@sgcs.com\fP -SGCS: SVR3 support, X Consortium Sponsor +XFree86 was originally based on \fIX386 1.2\fP by Thomas Roell, which +was contributed to the then X Consortium's X11R5 distribution by SGCS. .PP - ... and many more people out there on the net who helped with ideas and -bug-fixes. +The project that became XFree86 was originally founded in 1992 by +David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat. .PP -XFree86 was integrated into X11R6 by the following team: +XFree86 was later integrated in the then X Consortium's X11R6 release +by a group of dedicated XFree86 developers, including the following: .PP +.RS 4 .nf Stuart Anderson \fIanderson@metrolink.com\fP Doug Anson \fIdanson@lgc.com\fP @@ -350,228 +530,33 @@ Thomas Wolfram \fIwolf@prz.tu-berlin.de\fP Orest Zborowski \fIorestz@eskimo.com\fP .fi +.RE .PP -The \fIXFree86\fP enhancement package was provided by: -.TP 8 -David Dawes, \fIdawes@XFree86.org\fP -Release coordination, administration of FTP repository and mailing lists. -Source tree management -and integration, accelerated server integration, fixing, and coding. -.TP 8 -Glenn Lai, \fIglenn@cs.utexas.edu\fP -The SpeedUp code for ET4000 based SVGA cards, and ET4000/W32 accelerated -server. -.TP 8 -Jim Tsillas, \fIjtsilla@ccs.neu.edu\fP -Many server speedups from the fX386 series of enhancements. -.TP 8 -David Wexelblat, \fIdwex@XFree86.org\fP -Integration of the fX386 code into the default server, -many driver fixes, and driver documentation, assembly of the VGA -card/monitor database, development of the generic video mode listing. -Accelerated server integration, fixing, and coding. -.TP 8 -Dirk Hohndel, \fIhohndel@XFree86.org\fP -Linux shared libraries and release coordination. Accelerated server -integration and fixing. Generic administrivia and documentation. +The current XFree86 core team consists of: .PP -.TP 8 -Amancio Hasty Jr., \fIhasty@netcom.com\fP -Porting to \fB386BSD\fP version 0.1 and XS3 development. -.TP 8 -Rich Murphey, \fIrich@XFree86.org\fP -Ported to \fB386BSD\fP version 0.1 based on the original port by Pace Willison. -Support for \fB386BSD\fP, \fBFreeBSD\fP, and \fBNetBSD\fP. -.TP 8 -Robert Baron, \fIRobert.Baron@ernst.mach.cs.cmu.edu\fP -Ported to \fBMach\fP. -.TP 8 -Orest Zborowski, \fIorestz@eskimo.com\fP -Ported to \fBLinux\fP. -.TP 8 -Doug Anson, \fIdanson@lgc.com\fP -Ported to \fBSolaris x86\fP. -.TP 8 -David Holland, \fIdavidh@use.com\fP -Ported to \fBSolaris x86\fP. -.TP 8 -David McCullough, \fIdavidm@stallion.oz.au\fP -Ported to \fBSCO SVR3\fP. -.TP 8 -Michael Rohleder, \fImichael.rohleder@stadt-frankfurt.de\fP -Ported to \fBISC SVR3\fP. -.TP 8 -Kees Verstoep, \fIversto@cs.vu.nl\fP -Ported to \fBAmoeba\fP based on Leendert van Doorn's original Amoeba port of -X11R5. -.TP 8 -Marc Evans, \fIMarc@XFree86.org\fP -Ported to \fBOSF/1\fP. -.TP 8 -Philip Homburg, \fIphilip@cs.vu.nl\fP -Ported to \fBMinix-386vm\fP. -.TP 8 -Thomas Mueller, \fItm@systrix.de\fP -Ported to \fBLynxOS\fP. -.TP 8 -Jon Tombs, \fItombs@XFree86.org\fP -S3 server and accelerated server coordination. -.TP 8 -Harald Koenig, \fIkoenig@tat.physik.uni-tuebingen.de\fP -S3 server development. -.TP 8 -Bernhard Bender, \fIbr@elsa.mhs.compuserve.com\fP -S3 server development. -.TP 8 -Kevin Martin, \fImartin@cs.unc.edu\fP -Overall work on the base accelerated servers (ATI and 8514/A), and Mach64 -server. -.TP 8 -Rik Faith, \fIfaith@cs.unc.edu\fP -Overall work on the base accelerated servers (ATI and 8514/A). -.TP 8 -Tiago Gons, \fItiago@comosjn.hobby.nl\fP -Mach8 and 8514/A server development -.TP 8 -Hans Nasten, \fInasten@everyware.se\fP -Mach8, 8514/A, and S3 server development and BSD/386 support -.TP 8 -Mike Bernson, \fImike@mbsun.mlb.org\fP -Mach32 server development. -.TP 8 -Mark Weaver, \fIMark_Weaver@brown.edu\fP -Mach32 server development. -.TP 8 -Craig Groeschel, \fIcraig@metrolink.com\fP -Mach32 server development. -.TP 8 -Henry Worth, \fIHenry.Worth@amail.amdahl.com\fP -AGX server. -.TP 8 -Erik Nygren, \fInygren@mit.edu\fP -P9000 server. -.TP 8 -Harry Langenbacher \fIharry@brain.jpl.nasa.gov\fP -P9000 server. -.TP 8 -Chris Mason, \fImason@mail.csh.rit.edu\fP -P9000 server. -.TP 8 -Henrik Harmsen \fIharmsen@eritel.se\fP -P9000 server. -.TP 8 -Simon Cooper, \fIscooper@vizlab.rutgers.edu\fP -Cirrus accelerated code (based on work by Bill Reynolds). -.TP 8 -Harm Hanemaayer, \fIhhanemaa@cs.ruu.nl\fP -Cirrus accelerated code, and ARK driver. -.TP 8 -Thomas Zerucha, \fIzerucha@shell.portal.com\fP -Support for Cirrus CL-GD7543. -.TP 8 -Leon Bottou, \fIbottou@laforia.ibp.fr\fP -ARK driver. -.TP 8 -Mike Tierney, \fIfloyd@eng.umd.edu\fP -WD accelerated code. -.TP 8 -Bill Conn, \fIconn@bnr.ca\fP -WD accelerated code. -.TP 8 -Brad Bosch, \fIbrad@lachman.com\fP -WD 90C24A support. -.TP 8 -Alan Hourihane, \fIalanh@fairlite.demon.co.uk\fP -Trident SVGA driver, SiS SVGA driver and DEC 21030 server. -.TP 8 -Marc Aurele La France, \fItsi@ualberta.ca\fP -ATI SVGA driver -.TP 8 -Steve Goldman, \fIsgoldman@encore.com\fP -Oak 067/077 SVGA driver. -.TP 8 -Jorge Delgado, \fIernar@dit.upm.es\fP -Oak SVGA driver, and 087 accelerated code. -.TP 8 -Bill Conn, \fIconn@bnr.ca\fP -WD accelerated code. -.TP 8 -Paolo Severini, \fIlendl@dist.dist.unige.it\fP -AL2101 SVGA driver -.TP 8 -Ching-Tai Chiu, \fIcchiu@netcom.com\fP -Avance Logic ALI SVGA driver -.TP 8 -Manfred Brands, \fImb@oceonics.nl\fP -Cirrus 64xx SVGA driver -.TP 8 -Randy Hendry, \fIrandy@sgi.com\fP -Cirrus 6440 support in the cl64xx SVGA driver -.TP 8 -Frank Dikker, \fIdikker@cs.utwente.nl\fP -MX SVGA driver -.TP 8 -Regis Cridlig, \fIcridlig@dmi.ens.fr\fP -Chips & Technologies driver -.TP 8 -Jon Block, \fIblock@frc.com\fP -Chips & Technologies driver -.TP 8 -Mike Hollick, \fIhollick@graphics.cis.upenn.edu\fP -Chips & Technologies driver -.TP 8 -Nozomi Ytow -Chips & Technologies driver -.TP 8 -Egbert Eich, \fIEgbert.Eich@Physik.TH-Darmstadt.DE\fP -Chips & Technologies driver -.TP 8 -David Bateman, \fIdbateman@ee.uts.edu.au\fP -Chips & Technologies driver -.TP 8 -Xavier Ducoin, \fIxavier@rd.lectra.fr\fP -Chips & Technologies driver -.TP 8 -Peter Trattler, \fIpeter@sbox.tu-graz.ac.at\fP -RealTek SVGA driver -.TP 8 -Craig Struble, \fIcstruble@acm.vt.edu\fP -Video7 SVGA driver -.TP 8 -Gertjan Akkerman, \fIakkerman@dutiba.twi.tudelft.nl\fP -16 colour VGA server, and XF86Config parser. -.TP 8 -Davor Matic, \fIdmatic@Athena.MIT.EDU\fP -Hercules driver. -.TP 8 -Pascal Haible, \fIhaible@izfm.uni-stuttgart.de\fP -Banked monochrome VGA support, Hercules support, and mono frame buffer -support for dumb monochrome devices -.TP 8 -Martin Schaller, -.TP 8 -Geert Uytterhoeven,\fIGeert.Uytterhoeven@cs.kuleuven.ac.be\fP -Linux/m68k Frame Buffer Device driver -.TP 8 -Andreas Schwab, \fIschwab@issan.informatik.uni-dortmund.de\fP -Linux/m68k Frame Buffer Device driver -.TP 8 -Guenther Kelleter, \fIguenther@Pool.Informatik.RWTH-Aachen.de\fP -Linux/m68k Frame Buffer Device driver -.TP 8 -Frederic Lepied, \fILepied@XFree86.Org\fP -XInput extension integration. Wacom, joystick and extended mouse drivers. -.TP 8 -Patrick Lecoanet, \fIlecoanet@cena.dgac.fr\fP -Elographics touchscreen driver. -.TP 8 -Steven Lang, \fItiger@tyger.org\fP -SummaSketch tablet driver. -.PP - ... and many more people out there on the net who helped with beta-testing -this enhancement. +.RS 4 +.nf +Stuart Anderson \fIanderson@metrolink.com\fP +Preston Brown \fIpbrown@redhat.com\fP +Robin Cutshaw \fIrobin@xfree86.org\fP +David Dawes \fIdawes@xfree86.org\fP +Egbert Eich \fIeich@xfree86.org\fP +Marc Evans \fImarc@xfree86.org\fP +Dirk Hohndel \fIhohndel@xfree86.org\fP +Alan Hourihane \fIalanh@xfree86.org\fP +Harald Koenig \fIkoenig@xfree86.org\fP +Marc La France \fItsi@xfree86.org\fP +Kevin Martin \fImartin@xfree86.org\fP +Rich Murphey \fIrich@xfree86.org\fP +Takaaki Nomura \fIamadeus@yk.rim.or.jp\fP +Keith Packard \fIkeithp@xfree86.org\fP +Jon Tombs \fIjon@gtex02.us.es\fP +Mark Vojkovich \fImarkv@xfree86.org\fP +David Wexelblat \fIdwex@xfree86.org\fP +.fi +.RE .PP \fIXFree86\fP source is available from the FTP server -\fIftp.XFree86.org\fP, among others. Send email to -\fIXFree86@XFree86.org\fP for details. -.\" $XConsortium: XFree86.man /main/25 1996/12/09 17:33:22 kaleb $ +\fI\fP, among others. Documentation +and other information can be found from the XFree86 web site +\fI\fP. Index: xc/programs/Xserver/hw/xfree86/xf86Version.h diff -u xc/programs/Xserver/hw/xfree86/xf86Version.h:3.460 xc/programs/Xserver/hw/xfree86/xf86Version.h:3.460.2.4 --- xc/programs/Xserver/hw/xfree86/xf86Version.h:3.460 Mon Dec 18 00:55:35 2000 +++ xc/programs/Xserver/hw/xfree86/xf86Version.h Fri Mar 16 11:42:31 2001 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.460 2000/12/18 05:55:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.460.2.4 2001/03/16 16:42:31 dawes Exp $ */ -#define XF86_VERSION " 4.0.2 " +#define XF86_VERSION " 4.0.3 " /* The finer points in versions... */ #define XF86_VERSION_MAJOR 4 #define XF86_VERSION_MINOR 0 -#define XF86_VERSION_SUBMINOR 2 +#define XF86_VERSION_SUBMINOR 3 #define XF86_VERSION_BETA 0 /* 0="", 1="A", 2="B", etc... */ #define XF86_VERSION_ALPHA 0 /* 0="", 1="a", 2="b", etc... */ @@ -18,6 +18,6 @@ XF86_VERSION_BETA, \ XF86_VERSION_ALPHA) -#define XF86_DATE "18 December 2000" +#define XF86_DATE "16 March 2001" /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ Index: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c diff -u xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.17 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.17.2.2 --- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.17 Fri Jun 23 18:42:02 2000 +++ xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c Fri Mar 2 17:55:24 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.17 2000/06/23 22:42:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.17.2.2 2001/03/02 22:55:24 dawes Exp $ */ /* * (c) Copyright 1993,1994 by David Dawes * @@ -78,12 +78,26 @@ /* NetBSD's wscons has a PCVT compatibility module. */ # include # else -# include +# if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +# include +# else +# include +# endif # endif # endif # ifdef SYSCONS_SUPPORT /* both, Free and NetBSD have syscons */ -# include +# if defined(__FreeBSD__) +# include +# if __FreeBSD_version >= 410000 +# include +# include +# else +# include +# endif +# else +# include +# endif # endif # else # ifdef CODRV_SUPPORT Index: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c diff -u xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.56 xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.56.2.1 --- xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.56 Wed Dec 6 10:35:07 2000 +++ xc/programs/Xserver/hw/xfree86/common/xf86Bus.c Sat Feb 10 05:23:53 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.56 2000/12/06 15:35:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.56.2.1 2001/02/10 10:23:53 alanh Exp $ */ /* * Copyright (c) 1997-1999 by The XFree86 Project, Inc. */ @@ -443,7 +443,8 @@ pEnt->chipset = xf86Entities[entityIndex]->chipset; pEnt->resources = xf86Entities[entityIndex]->resources; pEnt->driver = xf86Entities[entityIndex]->driver; - if (xf86Entities[entityIndex]->devices[0]) { + if ( (xf86Entities[entityIndex]->devices) && + (xf86Entities[entityIndex]->devices[0]) ) { for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++) if (xf86Entities[entityIndex]->devices[i]->screen == 0) break; @@ -469,7 +470,8 @@ int i; /* We might not use AddDevtoEntity */ - if (!xf86Entities[entityIndex]->devices[0]) + if ( (!xf86Entities[entityIndex]->devices) || + (!xf86Entities[entityIndex]->devices[0]) ) return NULL; if (entityIndex >= xf86NumEntities || Index: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c diff -u xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.49 xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.49.2.1 --- xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.49 Tue Dec 12 13:23:50 2000 +++ xc/programs/Xserver/hw/xfree86/common/xf86Configure.c Sun Feb 11 13:03:48 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.49 2000/12/12 18:23:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.49.2.1 2001/02/11 18:03:48 herrb Exp $ */ /* * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales. * @@ -286,6 +286,14 @@ path[len] = '\0'; if (strstr(path, "psaux") != NULL) DFLT_MOUSE_PROTO = "PS/2"; + } +#endif +#ifdef WSCONS_SUPPORT + fd = open("/dev/wsmouse0", 0); + if (fd > 0) { + DFLT_MOUSE_DEV = "/dev/wsmouse0"; + DFLT_MOUSE_PROTO = "wsmouse"; + close(fd); } #endif Index: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c diff -u xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.37 xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.37.2.1 --- xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.37 Fri Jun 30 15:06:56 2000 +++ xc/programs/Xserver/hw/xfree86/common/xf86DGA.c Fri Mar 9 13:03:18 2001 @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.37 2000/06/30 19:06:56 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.37.2.1 2001/03/09 18:03:18 eich Exp $ */ #include "xf86.h" #include "xf86str.h" @@ -266,7 +266,7 @@ pScreenPriv->current = NULL; pScrn->vtSema = TRUE; if(pScreenPriv->savedColormap) { - miInstalledMaps[index] = pScreenPriv->savedColormap; + (*pScreen->InstallColormap)(pScreenPriv->savedColormap); pScreenPriv->savedColormap = NULL; } pScreenPriv->dgaColormap = NULL; @@ -644,6 +644,7 @@ if(!pScreenPriv->dgaColormap) pScreenPriv->savedColormap = miInstalledMaps[pScreen->myNum]; + pScreenPriv->dgaColormap = cmap; (*pScreen->InstallColormap)(cmap); Index: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h diff -u xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.83 xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.83.2.2 --- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.83 Thu Dec 7 16:34:20 2000 +++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Tue Mar 6 13:51:55 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.83 2000/12/07 21:34:20 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.83.2.2 2001/03/06 18:51:55 mvojkovi Exp $ */ /* * PCI Probe * @@ -231,6 +231,7 @@ #define PCI_CHIP_MACH64LS 0x4C53 #define PCI_CHIP_RAGE128MF 0x4D46 #define PCI_CHIP_RAGE128ML 0x4D4C +#define PCI_CHIP_RAGE128PD 0x5044 #define PCI_CHIP_RAGE128PF 0x5046 #define PCI_CHIP_RAGE128PR 0x5052 #define PCI_CHIP_RADEON_QD 0x5144 @@ -473,6 +474,8 @@ #define PCI_CHIP_UTNT2 0x0029 #define PCI_CHIP_VTNT2 0x002C #define PCI_CHIP_UVTNT2 0x002D +#define PCI_CHIP_TNT2_A 0x002E +#define PCI_CHIP_TNT2_B 0x002F #define PCI_CHIP_ITNT2 0x00A0 #define PCI_CHIP_GEFORCE256 0x0100 #define PCI_CHIP_GEFORCEDDR 0x0101 @@ -485,7 +488,12 @@ #define PCI_CHIP_GEFORCE2GTS_1 0x0151 #define PCI_CHIP_GEFORCE2ULTRA 0x0152 #define PCI_CHIP_QUADRO2PRO 0x0153 +#define PCI_CHIP_GEFORCE3 0x0200 +#define PCI_CHIP_GEFORCE3_1 0x0201 +#define PCI_CHIP_GEFORCE3_2 0x0202 +#define PCI_CHIP_GEFORCE3_3 0x0203 + /* NVIDIA & SGS */ #define PCI_CHIP_RIVA128 0x0018 @@ -796,6 +804,7 @@ {PCI_CHIP_MACH64LS, "Mach64 LS",0}, {PCI_CHIP_RAGE128MF, "Rage 128 Mobility MF",0}, {PCI_CHIP_RAGE128ML, "Rage 128 Mobility ML",0}, + {PCI_CHIP_RAGE128PD, "Rage 128 Pro PD",0}, {PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0}, {PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0}, {PCI_CHIP_RADEON_QD, "Radeon QD",0}, @@ -1206,6 +1215,8 @@ {PCI_CHIP_UTNT2, "Riva Ultra TNT2",0}, {PCI_CHIP_VTNT2, "Riva Vanta",0}, {PCI_CHIP_UVTNT2, "Riva Ultra 64",0}, + {PCI_CHIP_TNT2_A, "Riva TNT2 (A)",0}, + {PCI_CHIP_TNT2_B, "Riva TNT2 (B)",0}, {PCI_CHIP_ITNT2, "Riva Integrated",0}, {PCI_CHIP_GEFORCE256, "GeForce 256",0}, {PCI_CHIP_GEFORCEDDR, "GeForce DDR",0}, @@ -1217,6 +1228,10 @@ {PCI_CHIP_GEFORCE2GTS_1,"GeForce2 GTS (rev 1)",0}, {PCI_CHIP_GEFORCE2ULTRA,"GeForce2 Ultra",0}, {PCI_CHIP_QUADRO2PRO, "Quadro 2 Pro",0}, + {PCI_CHIP_GEFORCE3, "GeForce3",0}, + {PCI_CHIP_GEFORCE3_1, "GeForce3 (rev 1)",0}, + {PCI_CHIP_GEFORCE3_2, "GeForce3 (rev 2)",0}, + {PCI_CHIP_GEFORCE3_3, "GeForce3 (rev 3)",0}, {0x0000, NULL,0}}}, #ifdef VENDOR_INCLUDE_NONVIDEO {PCI_VENDOR_IMS, { Index: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c diff -u xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.28 xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.28.2.1 --- xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.28 Fri Dec 8 15:13:35 2000 +++ xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c Sat Feb 10 05:23:55 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.28 2000/12/08 20:13:35 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.28.2.1 2001/02/10 10:23:55 alanh Exp $ */ /* * Copyright (c) 1997-1999 by The XFree86 Project, Inc. @@ -2343,7 +2343,8 @@ p->pciBusId.func = func; p->active = active; p->inUse = FALSE; - xf86AddDevToEntity(num, dev); + if (dev) + xf86AddDevToEntity(num, dev); /* Here we initialize the access structure */ p->access = xnfcalloc(1,sizeof(EntityAccessRec)); while (ppaccp && *ppaccp) { Index: xc/programs/Xserver/hw/xfree86/doc/BugReport diff -u xc/programs/Xserver/hw/xfree86/doc/BugReport:1.3 xc/programs/Xserver/hw/xfree86/doc/BugReport:1.3.2.2 --- xc/programs/Xserver/hw/xfree86/doc/BugReport:1.3 Thu Aug 3 08:24:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/BugReport Fri Mar 16 11:10:42 2001 @@ -5,7 +5,7 @@ VERSION: -4.0.1a +4.0.3 VIDEO DRIVER: @@ -54,4 +54,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/BugReport,v 1.3 2000/08/03 12:24:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/BugReport,v 1.3.2.2 2001/03/16 16:10:42 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/DESIGN diff -u xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.33 xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.33.2.2 --- xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.33 Mon Dec 4 14:47:21 2000 +++ xc/programs/Xserver/hw/xfree86/doc/DESIGN Tue Mar 13 12:19:26 2001 @@ -408,12 +408,12 @@ points required during the early phase of InitOutput(). xf86AddDriver() adds it to the global xf86DriverList[] array. -The DriverRec contains the driver's version, a short descriptive message, the -Identify(), Probe() and AvailableOptions() function entry points as well as a -pointer to the driver's module (as returned from the loader when the driver -was loaded) and a reference count which keeps track of how many screens are -using the driver. The entry driver entry points are those required prior to -the driver allocating and filling in its ScrnInfoRec. +The DriverRec contains the driver canonical name, the Identify(), Probe() and +AvailableOptions() function entry points as well as a pointer to the driver's +module (as returned from the loader when the driver was loaded) and a refer- +ence count which keeps track of how many screens are using the driver. The +entry driver entry points are those required prior to the driver allocating +and filling in its ScrnInfoRec. For a static server, the xf86DriverList[] array is initialised at build time, and the loading of modules is not done. @@ -5368,7 +5368,7 @@ DriverRec ZZZ = { VERSION, - "unaccelerated driver for ZZZ Zzzzzy cards", + ZZZ_DRIVER_NAME, ZZZIdentify, ZZZProbe, ZZZAvailableOptions, @@ -6302,7 +6302,7 @@ ZZZFreeRec(xf86Screens[scrnIndex]); } - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39 2000/12/04 18:49:54 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39.2.1 2001/02/08 19:31:03 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.33 2000/12/04 19:47:21 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.33.2.2 2001/03/13 17:19:26 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/Imakefile diff -u xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.72 xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.72.2.1 --- xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.72 Mon Dec 11 11:06:49 2000 +++ xc/programs/Xserver/hw/xfree86/doc/Imakefile Fri Mar 16 09:55:40 2001 @@ -4,7 +4,7 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.72 2000/12/11 16:06:49 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.72.2.1 2001/03/16 14:55:40 dawes Exp $ #include #include @@ -77,7 +77,7 @@ $(_NULLENTRY_) MAINDOCS = LICENSE README /*ReadmeFile(Config)*/ /*BUILD*/ RELNOTES \ - Install Status DESIGN + Install Status DESIGN Versions OTHERDOCS = /*VideoModes.doc*/ /*QuickStart.doc*/ /*xinput*/ \ ReadmeFile(fonts) ReadmeFile(mouse) ReadmeFile(DRI) \ Index: xc/programs/Xserver/hw/xfree86/doc/Install diff -u xc/programs/Xserver/hw/xfree86/doc/Install:1.10 xc/programs/Xserver/hw/xfree86/doc/Install:1.10.2.3 --- xc/programs/Xserver/hw/xfree86/doc/Install:1.10 Fri Dec 15 14:38:06 2000 +++ xc/programs/Xserver/hw/xfree86/doc/Install Fri Mar 16 09:57:21 2001 @@ -1,8 +1,8 @@ - Installation Details for XFree86[tm] 4.0.2 + Installation Details for XFree86[tm] 4.0.3 The XFree86 Project, Inc - 15 December 2000 + 2 March 2001 Abstract @@ -20,14 +20,20 @@ installation script. We recommend that these be used to install the bina- ries. -2. Downloading the XFree86 4.0.2 binaries +2. Downloading the XFree86 4.0.3 binaries -We provide XFree86 4.0.2 binaries for a range of operating systems at our ftp -site . Often during -releases our ftp site is heavily loaded. Instead of downloading directly -from us we recommend that instead you use one of our mirror sites. Another -advantage of using our mirror sites is that some of them support http access -(ours does not). +XFree86 4.0.3 is an update release. The most recent full release (4.0.2) +needs to be installed before installing this update. Information about down- +loading and installing 4.0.2 can be found in the installation document for +that version, which can be found on the XFree86 web site +. + +We provide XFree86 4.0.3 update binaries for a range of operating systems at +our ftp site . Often +during releases our ftp site is heavily loaded. Instead of downloading +directly from us we recommend that instead you use one of our mirror sites. +Another advantage of using our mirror sites is that some of them support http +access (ours does not). Our binaries are organized by sub-directories which correspond to each of the OS/platforms for which we provide binaries. First go to the sub-directory @@ -51,23 +57,16 @@ should download that correctly. When downloading it under this name, select "save as" on your browser, and save the file under the name "Xinstall.sh". -Once you're run the Xinstall.sh script and found which binary distribution is -suitable for your system, download the necessary files. The twelve (12) -mandatory files for all installations are listed below. If you have not +Once you're run the Xinstall.sh script and found which binary update distri- +bution is suitable for your system, download the necessary files. The five +(5) mandatory files for all installations are listed below. If you have not downloaded all of the files, the installer script will complain. 1. Xinstall.sh The installer script 2. extract The utility for extracting tarballs - 3. Xbin.tgz X clients/utilities and run-time libraries - 4. Xlib.tgz Some data files required at run-time - 5. Xman.tgz Manual pages - 6. Xdoc.tgz XFree86 documentation - 7. Xfnts.tgz Base set of fonts - 8. Xfenc.tgz Base set of font encoding data - 9. Xetc.tgz Run-time configuration files - 10. Xvar.tgz Run-time data - 11. Xxserv.tgz XFree86 X server - 12. Xmod.tgz XFree86 X server modules + 3. Xupdate.tgz Updated files except X server drivers/modules + 4. Xdocupd.tgz Updated documentation + 5. Xdrivers.tgz Updated X server drivers NOTES: @@ -76,48 +75,22 @@ extract.exe instead. This should fix the problem. (This is not a DOS/Windows executable.) - o A few distributions don't have or require the Xvar.tgz tarball. If it - is present in the binaries sub-directory for your platform, then it is - required. + o The Darwin/Mac OS X distribution doesn't have or require the + Xdrivers.tgz tarball. - o The Darwin/Mac OS X distribution doesn't have or require the Xmod.tgz - tarball. - o Some distributions may have additional mandatory tarballs. While rare, the installer script will tell you if any are missing. - -The following thirteen (13) tarballs are optional. You should download the -ones you want to install. - - 1. Xfsrv.tgz Font server - 2. Xnest.tgz Nested X server - 3. Xprog.tgz X header files, config files and compile-time libs - 4. Xprt.tgz X Print server - 5. Xvfb.tgz Virtual framebuffer X server - 6. Xf100.tgz 100dpi fonts - 7. Xfcyr.tgz Cyrillic fonts - 8. Xflat2.tgz Latin-2 fonts - 9. Xfnon.tgz Some large bitmap fonts - 10. Xfscl.tgz Scalable fonts (Speedo and Type1) - 11. Xhtml.tgz HTML version of the documentation - 12. Xps.tgz PostScript version of the documentation - 13. Xjdoc.tgz Documentation in Japanese - -NOTES: - - o Some distributions may have some additional optional tarballs. -If you miss some and want to install them later, go to the Manual Installa- -tion (section 4., page 1) section. +3. Installing XFree86 4.0.3 using the Xinstall.sh script -3. Installing XFree86 4.0.2 using the Xinstall.sh script +We strongly recommend that our XFree86 4.0.3 binaries be installed using the +Xinstall.sh script that we provide. It is also important that the previous +full release (4.0.2) is installed before installing this update release. +Make sure that you use the 4.0.3 version of the Xinstall.sh script to install +this update. Older versions may not be able to do it correctly. There are a +lot of steps in the manual installation process, and those steps can vary +according to the platform and hardware setup. -We strongly recommend that our XFree86 4.0.2 binaries be installed using the -Xinstall.sh script that we provide. There are a lot of steps in the manual -installation process, and those steps can vary according to the platform and -hardware setup. There is a description of the manual installation process -for the most common cases below (section 4., page 1). - You must login as the super user (root) to run the installer script. Place all of the downloaded files into a single directory (choose a temporary loca- tion with enough space). Use the cd command to change to that directory and @@ -144,92 +117,29 @@ running, before continuing. If you ignore this warning and run into prob- lems, well, you were warned! -If you have an existing X installation, you will be warned that proceeding -with this installation will overwrite it. Only those things that are part of -our standard distribution will be overwritten. Other X applications that you -may have installed will not be removed. Some configuration files may be -overwritten though, but the installer should prompt you before doing so. As -the opening greeting says, it is strongly recommended that you backup any -existing installation before proceeding. If you want your old applications -to still be there after you've installed, don't do the "backup" by simply -renaming your old /usr/X11R6 directory. It is better to make a copy of it, -and then install over the top of the original one. If you run into problems -and want to revert to the old installation, you can then delete the overwrit- -ten one and copy the saved version back. +You will be warned that proceeding with this installation will overwrite it. +Only those things that are part of our standard distribution will be over- +written. Other X applications that you may have installed will not be +removed. Some configuration files may be overwritten though, but the +installer should prompt you before doing so. As the opening greeting says, +it is strongly recommended that you backup any existing installation before +proceeding. If you want your old applications to still be there after you've +installed, don't do the "backup" by simply renaming your old /usr/X11R6 +directory. It is better to make a copy of it, and then install over the top +of the original one. If you run into problems and want to revert to the old +installation, you can then delete the overwritten one and copy the saved ver- +sion back. During the first part of the installation over an existing version, the script may remove some old files or directories that would get in the way of the new installation. It will list which files/directories have been removed. If none are listed, then none were removed. -The next step when installing over an existing version is to check for exist- -ing configuration files. As of XFree86 version 3.9.18, the run-time configu- -ration files are installed by default under /etc/X11 instead of under -/usr/X11R6/lib/X11. The installer will move the existing ones for you and -create the necessary symbolic links. If you don't want to have these config- -uration files under /etc/X11, then you should answer "no" when asked about -it. Answering "no" here also means that the new configuration files will be -installed in the old /usr/X11R6/lib/X11 location. - -Note: for the rare systems that don't have symbolic links, this question will -not be asked. The default answer is "yes" because that is best for most sit- -uations. It is our new default. It makes it easier to share the /usr/X11R6 -directory between multiple hosts, and allows it to be mounted read-only. If -you don't need these features, then you can safely answer "no" if you don't -want them moved. - -When installing over an existing version, you will be prompted before each -set of configuration files is installed. If you haven't made any customisa- -tions to your existing configuration files, then you can safely answer "yes" -for each of these. If you have made customisations, you can try answering -"no". If you run into problems later, you may need to manually merge your -customisations into the the new version of the configuration files. The con- -figuration files can all be found in the Xetc.tgz tarball. See the section -below (section 4., page 1) about manual installation for information about -extracting them separately. - -After the configuration files have been dealt with, the other mandatory com- -ponents of the binary distribution will be installed. This should proceed -without any user intervention. - -If you downloaded any of the optional components, the installer will ask you -about each one before it is installed. The default answer is "yes". If -there are any that you've since decided that you don't want to install, -answer "no" when prompted. - -After that is done, the main part of the installation is complete. The next -steps are to tidy up some aspects of the installation. The first of these is -to run "ldconfig" on systems that require it, so that the newly installed -shared libraries are accessible. Then the fonts.dir files in some directo- -ries are updated so that the fonts can be accessed correctly. Next, the -installer checks to see if your system has a termcap file or terminfo files. -If it finds the former, it tells you how you may update the entries in that -file. If it finds the latter, it asks you if you want it to update them for -you. - -You may be asked if you want to create links for the GL libraries and header -files. The OpenGL standard on some platforms (Linux in particular) says that -these should be installed in the standard system locations (/usr/lib and -/usr/include), so the installer offers to create the appropriate links. If -you're running Linux, you should probably answer yes. For other platforms it -is your choice. If you already have another version of libGL in /usr/lib, -answering "yes" will remove it and replace it with a link to the version we -supply. The installer will show you a listing of any existing versions -before asking if they should be replaced. - -Finally, the installer asks you if you want a link created for the rstart -utility. On most modern systems the link isn't essential, so the default -answer is "no". Answer "yes" if you know that you need it. If you find -later that you need it, you can create it easily by running: - - rm -f /usr/bin/rstartd - ln -s /usr/X11R6/bin/rstartd /usr/bin/rstartd - 3.2 After the installation is complete The next step is to configure the X server. That is covered in detail in an as-yet unwritten document :-(. In the meantime, there are three ways to cre- -ate a basic X server configuration file for XFree86 4.0.2. One is to run the +ate a basic X server configuration file for XFree86 4.0.3. One is to run the xf86config utility. Another is to run the xf86cfg utility. The third option is to use the new -configure X server option: @@ -247,111 +157,8 @@ After the X server configuration is done, it may be advisable to reboot, especially if you run xdm (or equivalent) or the font server (xfs). - -4. Installing XFree86 4.0.2 manually - -This section describes how to manually install the XFree86 4.0.2 binary dis- -tributions. You should only use this method if you know what you're doing. -The information here covers some common cases, but not every possible case. - -Put all of the downloaded files into a single directory (choose some tempo- -rary location with enough space). Become the super user (root). All of the -following commands should be run as root, and they should be run from the -directory that has all of the downloaded files. The "extract" utility should -be used to unpack the tarballs. This is a customised version of GNU tar that -has the gzip code built-in, and which has a different usage when run under -the name "extract". One important thing that extract does that most versions -of tar do not do by default is that it unlinks existing files before writing -new ones. This is important when installing over an existing version of X. -If you choose to use some other utility to extract the tarballs, you're on -your own. - -4.1 A new installation - -The simplest case is when there is no existing X installation. The installa- -tion procedure for this case is as follows: - - chmod +x extract - mkdir /usr/X11R6 - mkdir /etc/X11 - ./extract -C /usr/X11R6 X[a-df-uw-z]*.tgz - ./extract -C /usr/X11R6 Xvfb.tgz # If you are installing Xvfb - ./extract -C /etc/X11 Xetc.tgz - ./extract -C /var Xvar.tgz - ln -s /etc/X11/app-defaults /usr/X11R6/lib/X11 - ln -s /etc/X11/fs /usr/X11R6/lib/X11 - ln -s /etc/X11/lbxproxy /usr/X11R6/lib/X11 - ln -s /etc/X11/proxymngr /usr/X11R6/lib/X11 - ln -s /etc/X11/rstart /usr/X11R6/lib/X11 - ln -s /etc/X11/twm /usr/X11R6/lib/X11 - ln -s /etc/X11/xdm /usr/X11R6/lib/X11 - ln -s /etc/X11/xinit /usr/X11R6/lib/X11 - ln -s /etc/X11/xsm /usr/X11R6/lib/X11 - ln -s /etc/X11/xserver /usr/X11R6/lib/X11 - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD - /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc - -4.2 Installing over an old installation - -If you have an existing installation of X, you should make a backup copy of -it before installing the new version over the top of it. - -Before doing anything else, make sure the extract command is executable, and -also link it to the name "gnu-tar" so that it can be used as a regular tar -command: - - chmod +x extract - rm -f gnu-tar - ln extract gnu-tar - -The first part of the procedure is to move the old run-time config files from -/usr/X11R6/lib/X11 to /etc/X11. Create /etc/X11 if it doesn't already exist. -For each of the following sub-directories (app-defaults, fs, lbxproxy, prox- -ymngr, rstart, twm, xdm, xinit, xsm, xserver) that you want to move, check -that there is a sub-directory of this name in /usr/X11R6/lib/X11. Create a -sub-directory of the same name under /etc/X11, then copy the files over by -running: - - ./gnu-tar -C /usr/X11R6/lib/X11/subdir -c -f - . | \ - ./gnu-tar -C /etc/X11/subdir -v -x -p -U -f - - -For each subdirectory that is moved, remove the one under /usr/X11R6/lib/X11 -and create a symbolic link to the new location: - - rm -fr /usr/X11R6/lib/X11/subdir - ln -s /etc/X11/subdir /usr/X11R6/lib/X11 - -For those subdirectories that didn't already exist under /usr/X11R6/lib/X11, -create one under /etc/X11 and create the symbolic link to it: - - mkdir /etc/X11/subdir - ln -s /etc/X11/subdir /usr/X11R6/lib/X11 - -Once that is done, extract the config files from the Xetc.tgz tarball into a -temporary directory: - - mkdir tmpdir - ./extract -C tmpdir Xetc.tgz - -and then copy each sub-directory over to the installed location: - - ./gnu-tar -C tmpdir/subdir -c -f - . | \ - ./gnu-tar -C /usr/X11R6/lib/X11/subdir -v -x -p -U -f - - -If you have customised any config files in your old installation, you may -want to omit those sub-directories, or copy selected files over by hand. - -Once that's done, the main part of the installation can be done: - - ./extract -C /usr/X11R6 `pwd`/X[a-df-uw-z]*.tgz - ./extract -C /usr/X11R6 Xvfb.tgz # If you are installing Xvfb - ./extract -C /var Xvar.tgz - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD - /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.10 2000/12/15 19:09:06 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.10.2.2 2001/03/14 18:23:45 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/Install,v 1.10 2000/12/15 19:38:06 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/Install,v 1.10.2.3 2001/03/16 14:57:21 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/LICENSE diff -u xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.11 xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.11.2.2 --- xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.11 Fri Dec 1 14:47:45 2000 +++ xc/programs/Xserver/hw/xfree86/doc/LICENSE Fri Mar 16 11:13:05 2001 @@ -2,14 +2,14 @@ The XFree86 Project - 1999 + March 2001 1. XFree86 License XFree86 code without an explicit copyright is covered by the following copy- right/license: -Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (C) 1994-2001 The XFree86 Project, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -592,7 +592,7 @@ or - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.7 2000/03/06 22:59:23 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.7.2.1 2001/03/16 16:12:06 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.11 2000/12/01 19:47:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.11.2.2 2001/03/16 16:13:05 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes diff -u xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.17 xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.17.2.1 --- xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.17 Fri Dec 1 14:47:45 2000 +++ xc/programs/Xserver/hw/xfree86/doc/OS2.Notes Tue Mar 13 12:19:27 2001 @@ -226,4 +226,4 @@ $XConsortium: OS2note.sgml /main/1 1996/02/24 10:08:59 kaleb $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v 3.17 2000/12/01 19:47:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v 3.17.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README diff -u xc/programs/Xserver/hw/xfree86/doc/README:3.109 xc/programs/Xserver/hw/xfree86/doc/README:3.109.2.4 --- xc/programs/Xserver/hw/xfree86/doc/README:3.109 Fri Dec 15 13:14:32 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README Fri Mar 16 11:01:13 2001 @@ -1,8 +1,8 @@ - README for XFree86[tm] 4.0.2 + README for XFree86[tm] 4.0.3 The XFree86 Project, Inc - 15 December 2000 + 2 March 2001 Abstract @@ -10,10 +10,16 @@ supports several UNIX(R) and UNIX-like (such as Linux, the BSDs and Solaris x86) operating systems on Intel and other platforms. -1. What is XFree86 4.0.2? +1. What is XFree86 4.0.3? -XFree86 4.0.2 is the third full release in the new XFree86 4 series. +XFree86 4.0.3 is the first update to 4.0.2, the third full release in the new +XFree86 4 series. +Update releases are taken from a stable/maintenance branch. They are +designed to be installed on top of the full release that they are updating. +They contain fixes for serious problems, most commonly fixes for security +issues, fixes for driver bugs, and fixes that improve stability. + XFree86 release 4 is a major re-design of the basic architectural underpin- nings of XFree86's implementation of the original X Consortium's X Server. This re-design allows for a modular interaction between the hardware drivers @@ -25,8 +31,7 @@ The road to XFree86 release 4 began as an architectural concept in mid 1997, with the serious framework being implemented in code the beginning of 1998. There were several snapshots on the road to 4.0 which are now part of the 4.0 -base release. The 4.0.2 version is an upgrade to 4.0.1, which include more -hardware ports, code enhancements and bug fixes. +base release. Release 4 also included the long-awaited integration of the DRI (Direct Ren- dering Infrastructure). This upgrade into the code base gives XFree86 the @@ -40,6 +45,9 @@ Specific release enhancements can be viewed in the Release Notes. +The XFree86 version numbering system has had some changes as of the 4.0.2 +release. Information about this can be found in the Versions Document. + Information about binary distributions and the attendant installation instructions can be found in the Installation Document. @@ -113,41 +121,26 @@ fix to . This will ensure that they are included in future releases. And thanks! You make this truly an Open group. -4. How to get XFree86 4.0.2 +4. How to get XFree86 4.0.3 -XFree86 4.0.2 can be found at the XFree86 ftp server -, and at mirrors of this +XFree86 4.0.3 can be found at the XFree86 ftp server +, and at mirrors of this server. Information about obtaining and installing binary distributions of this release can be found in the Installation Document. Information about obtaining the release in source form is given below. - -The source for version 4.0.2 is split into three tarballs: X402src-1.tgz, -X402src-2.tgz, X402src-3.tgz. The first contains everything except the fonts -and general X11 documentation. It is sufficient for building XFree86 is you -already have a set of fonts. The second contains the fonts and the source -for the general X11 documentation. The third contains the general X11 docu- -mentation in hardcopy format. - -A source patch relative to version 4.0.1 is also available. Because of its -size, it is split into four parts. The patch files are 4.0.1-4.0.2.diff1.gz, -4.0.1-4.0.2.diff2.gz, 4.0.1-4.0.2.diff3.gz and 4.0.1-4.0.2.diff4.gz. There -is also a tarball that contains some files that have components that can't be -included in a diff. It is 4.0.2.tgz. These patches should be applied to a -clean 4.0.1 source tree, working from the directory containing the xc/ direc- -tory. The patches should be applied by running: - - gzip -d < 4.0.1-4.0.2.diff1.gz | patch -p0 -E - gzip -d < 4.0.1-4.0.2.diff2.gz | patch -p0 -E - gzip -d < 4.0.1-4.0.2.diff3.gz | patch -p0 -E - gzip -d < 4.0.1-4.0.2.diff4.gz | patch -p0 -E - - gzip -d < 4.0.2.tgz | tar vxf - -The contrib part of the distribution has been folded into the main source -tree, so a separate contrib tarball is no longer required. +The source for version 4.0.3 is available as a patch relative to 4.0.2. The +patch file is 4.0.2-4.0.3.diff.gz. -To format the XFree86 documentation use the latest version of our doctools -package available as doctools-1.2.tgz. +The patch should be applied to a clean 4.0.2 source tree, working from the +directory containing the xc/ directory. The patch should be applied by run- +ning: + + gzip -d < 4.0.2-4.0.3.diff.gz | patch -p0 -E + +Information about getting the source for 4.0.2 can be found in the README +file for that version, which can be found on the XFree86 web site +. 5. Reporting Bugs @@ -158,7 +151,7 @@ system core dump. Do not edit the log file as our developers use it to reproduce and debug your problem. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.110 2000/12/15 16:11:57 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.110.2.4 2001/03/16 15:57:44 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.109 2000/12/15 18:14:32 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.109.2.4 2001/03/16 16:01:13 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.DECtga diff -u xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.17 xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.17.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.17 Fri Dec 1 14:47:46 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.DECtga Tue Mar 13 12:19:27 2001 @@ -6,7 +6,7 @@ 1. DEC 21030 - o The DEC 21030 is supported by XFree86 4.0.2. The driver is now par- + o The DEC 21030 is supported by XFree86 4.0.3. The driver is now par- tially accelerated. The built-in graphics on the Multia is supported in 8-plane mode, and PCI cards with 8 or 16 MB framebuffers are supported in 24-plane mode. TGA2 (aka PowerStorm 3D30/4D20) cards are not cur- @@ -65,4 +65,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 22:59:23 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DECtga,v 3.17 2000/12/01 19:47:46 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DECtga,v 3.17.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.DRI diff -u xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.12 xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.12.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.12 Tue Dec 12 14:04:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.DRI Tue Mar 13 12:19:27 2001 @@ -1081,4 +1081,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.15 2000/12/12 18:54:29 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.12 2000/12/12 19:04:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.12.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp diff -u xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp:3.6 xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp:3.6.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp:3.6 Tue Dec 12 14:04:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp Tue Mar 13 12:19:27 2001 @@ -517,4 +517,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.9 2000/12/12 17:48:10 alanh Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.6 2000/12/12 19:04:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.6.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.Darwin diff -u xc/programs/Xserver/hw/xfree86/doc/README.Darwin:1.3 xc/programs/Xserver/hw/xfree86/doc/README.Darwin:1.3.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.Darwin:1.3 Tue Dec 12 14:04:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.Darwin Tue Mar 13 12:19:27 2001 @@ -43,7 +43,7 @@ for download from the Apple Developer Connection. If you want to save some time, you can use the precompiled binaries provided -by the XFree86 server at . Follow the instructions in the Install document to install it. @@ -345,4 +345,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.4 2000/12/12 18:54:29 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Darwin,v 1.3 2000/12/12 19:04:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Darwin,v 1.3.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.I128 diff -u xc/programs/Xserver/hw/xfree86/doc/README.I128:1.10 xc/programs/Xserver/hw/xfree86/doc/README.I128:1.10.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.I128:1.10 Thu Dec 14 12:12:00 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.I128 Tue Mar 13 12:19:27 2001 @@ -100,4 +100,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.6 2000/12/13 01:55:47 robin Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.I128,v 1.10 2000/12/14 17:12:00 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.I128,v 1.10.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS diff -u xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.28 xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.28.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.28 Fri Dec 1 14:47:46 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.LynxOS Tue Mar 13 12:19:27 2001 @@ -1,4 +1,4 @@ - README for XFree86 4.0.2 on LynxOS + README for XFree86 4.0.3 on LynxOS Thomas Mueller @@ -13,19 +13,19 @@ See the Copyright Notice. -The sources for XFree86 4.0.2 are available by anonymous ftp from: +The sources for XFree86 4.0.3 are available by anonymous ftp from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2 +ftp://ftp.XFree86.org/pub/XFree86/4.0.3 Binaries of XFree86 for LynxOS x86 are available from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2/binaries/LynxOS +ftp://ftp.XFree86.org/pub/XFree86/4.0.3/binaries/LynxOS A list of mirror sites is provided by ftp://ftp.XFree86.org/pub/XFree86/MIR- RORS The binaries on the FTP site were built on the latest released LynxOS version -at the time XFree86 4.0.2 was released. In this case it is `LynxOS x86 +at the time XFree86 4.0.3 was released. In this case it is `LynxOS x86 3.0.1'. Because of changes made to the object format they don't run on LynxOS versions earlier than 3.0.0. @@ -37,7 +37,7 @@ 3.1.0' support has to be considered to be in `alpha state'. Initial tests were performed on LynxOS x86 only! -XFree86 4.0.2 supports LynxOS on the x86 and on the PowerPC platform. X +XFree86 4.0.3 supports LynxOS on the x86 and on the PowerPC platform. X servers are currently available only on the x86 platform. The X server may work with some PowerPC platforms supported by LynxOS though this has not (yet) been thoroughly tested. @@ -163,7 +163,7 @@ 3.5 X Server debug diagnostics output and other VT peculiarities Output made by the XFree86 X on its stdout or stderr will be lost after the -server switches to graphics mode. The XFree86 4.0.2 server stores its output +server switches to graphics mode. The XFree86 4.0.3 server stores its output in /usr/adm/XFree86.n.log (where n is the screen number). When the X server is running output made to other consoles will be lost. @@ -266,4 +266,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.20 2000/06/17 00:27:32 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS,v 3.28 2000/12/01 19:47:46 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS,v 3.28.2.1 2001/03/13 17:19:27 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD diff -u xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.75 xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.75.2.2 --- xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.75 Tue Dec 12 14:04:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.NetBSD Tue Mar 13 12:19:28 2001 @@ -1,24 +1,23 @@ - README for XFree86 4.0.2 on NetBSD + README for XFree86 4.0.3 on NetBSD Rich Murphey, David Dawes, Marc Wandschneider, Mark Weaver, Matthieu Herrb - Last modified on: 7 December 2000 + Last modified on: 3 March 2001 1. What and Where is XFree86? -XFree86 is a port of X11R6.4 that supports several versions of Intel-based -Unix. It is derived from X386 1.2, which was the X server distributed with -X11R5. This release consists of many new features and performance improve- -ments as well as many bug fixes. +XFree86 is the Open Source port of X.Org's X11R6.4 release that supports sev- +eral UNIX(R) and UNIX-like (such as Linux, the BSDs and Solaris x86) operat- +ing systems on Intel and other platforms. See the Copyright Notice. The sources for XFree86 are available by anonymous ftp from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2 +ftp://ftp.XFree86.org/pub/XFree86/4.0.3 -Binaries for NetBSD 1.3 and later are available from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2/binaries/NetBSD +Binaries for NetBSD 1.4 and later are available from: +ftp://ftp.XFree86.org/pub/XFree86/4.0.3/binaries/NetBSD A list of mirror sites is provided by http://www.xfree86.org/MIRRORS.shtml @@ -34,7 +33,7 @@ 3. New OS dependent features -See the Release Notes for non-OS dependent new features in XFree86 4.0.2. +See the Release Notes for non-OS dependent new features in XFree86 4.0.3. 3.1 New OS dependent features in 4.0.2 @@ -77,8 +76,8 @@ 5. Configuring X for Your Hardware -The /etc/XF86Config file tells the X server what kind of monitor, video card -and mouse you have. You must create it to tell the server what specific +The /etc/X11/XF86Config file tells the X server what kind of monitor, video +card and mouse you have. You must create it to tell the server what specific hardware you have. You'll need info on your hardware: @@ -89,6 +88,11 @@ o Your monitor's sync frequencies. +The recommended way to generate an XF86Config file is to use the xf86cfg +utility. The xf86config text utility is still there for the (few) cases +where xf86cfg can't be used. Also, there is a sample file installed as +/usr/X11R6/lib/X11/XF86Config.eg, which can be used as a starting point. + For details about the XF86Config file format, refer to the XF86Config(5) man- ual page. @@ -97,18 +101,19 @@ 5.1 About mouse configuration -The NetBSD pms mouse driver handles PS/2 style mice as Busmouse. Specify the -protocol as ``busmouse'' in the mouse section of your XF86Config file if -you're using a PS/2 mouse. +XFree86 4.0.3 has support for the mouse driver included in the wscons console +driver introduced by NetBSD 1.4. Specify ``wsmouse'' as the protocol and +``/dev/wsmouse0'' as the device in /etc/X11/XF86Config if you're using NetBSD +1.4 or later with a PS/2 mouse. + +For older releases, the NetBSD pms mouse driver handles PS/2 style mice as +Busmouse. Specify the protocol as ``busmouse'' in the mouse section of your +XF86Config file if you're using a PS/2 mouse with NetBSD 1.3 or former +releases. Only standard PS/2 mice are supported by this driver. Newest PS/2 mice that send more than three bytes at a time (especially Intellimouse, or MouseMan+ -with a ``3D'' roller) are not supported yet. - -XFree86 4.0.2 also has support for the mouse driver included in the new -wscons console driver introduced by NetBSD 1.4. Specify ``wsmouse'' as the -protocol and ``/dev/wsmouse0'' as the device in /etc/XF86Config if you're -using NetBSD 1.4 with wscons. +with a wheel) are not supported by NetBSD 1.3 and former releases. See README.mouse for general instruction on mouse configuration in XFree86. @@ -140,8 +145,8 @@ in /etc/rc.conf. -Under NetBSD 1.4 with the wscons console driver, you must enable a virtual -console for the X server first. To do this follow these steps: +Under NetBSD 1.4 and later with the wscons console driver, you must enable a +virtual console for the X server first. To do this follow these steps: o Make sure the device file exists. If not, ``cd /dev ; ./MAKEDEV wscons''. @@ -182,9 +187,10 @@ The pccons driver is the most widely tested and is the console driver con- tained in the NetBSD binary distribution's kernels. -The pcvt console driver is bundled with NetBSD. The pcvt X mode is compatible -with the pccons driver X mode. It offers several virtual consoles and inter- -national keyboard support. In order to use this driver, change the line: +The pcvt console driver was bundled with NetBSD until 1.4. The pcvt X mode is +compatible with the pccons driver X mode. It offers several virtual consoles +and international keyboard support. In order to use this driver, change the +line: device pc0 at isa? port "IO_KBD" irq 1 @@ -194,8 +200,9 @@ in your kernel config file, and rebuild and install your kernel. -XFree86 will also run with the wscons console driver in NetBSD 1.4. For now, -it uses the pcvt compatibility mode, so be sure to have the lines: +Wscons is the current console driver, included in NetBSD 1.4 and later. For +now, XFree86 supports wscons using the pcvt compatibility mode, so be sure to +have the lines: options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls @@ -212,14 +219,14 @@ access to the /dev/mem device when in multi-users mode. But XFree86 servers can take advantage (or require) linear access to the display memory. -Most XFree86 4.0.2 card drivers require linear memory access. There are two +Most XFree86 4.0.3 card drivers require linear memory access. There are two ways to allow XFree86 to access linear memory: The first way is to disable the kernel security feature by adding ``option INSECURE'' in the kernel configuration file and build a new kernel. The second way is to install the aperture driver, included in source form in -xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the XFree86 4.0.2 source +xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the XFree86 4.0.3 source distribution. Unpack it in a new directory of your choice by running: sh apNetBSD.shar @@ -318,6 +325,11 @@ to xc/config/host.def before rebuilding the server. This has not been thor- oughly tested, except on the macppc. +For the i386, you should include both pcvt and wscons support in order to use +the pcvt compatibility mode of wscons: + + #define XFree86ConsoleDefines -DPCVT_SUPPORT -DWSCONS_SUPPORT + 8.4 Building on other architectures Note that the NetBSD project has now its own source tree, based on the @@ -358,7 +370,7 @@ particular, David Dawes, Pace Willison, Amancio Hasty, Christoph Robitschko, Nate Williams, Rod Grimes, Jack Velte and Michael Smith. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.59 2000/12/12 18:54:29 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.59.2.1 2001/03/04 09:41:30 herrb Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.75 2000/12/12 19:04:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.75.2.2 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD diff -u xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.20 xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.20.2.3 --- xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.20 Tue Dec 12 14:04:02 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD Fri Mar 16 11:01:14 2001 @@ -1,25 +1,24 @@ - README for XFree86 4.0.2 on OpenBSD + README for XFree86 4.0.3 on OpenBSD Matthieu Herrb - Last modified on: 2 December 2000 + Last modified on: 3 March 2000 1. What and Where is XFree86? -XFree86 is a port of X11R6.4 that supports several versions of Intel-based -Unix. It is derived from X386 1.2, which was the X server distributed with -X11R5. This release consists of many new features and performance improve- -ments as well as many bug fixes. +XFree86 is the Open Source port of X.Org's X11R6.4 release that supports sev- +eral UNIX(R) and UNIX-like (such as Linux, the BSDs and Solaris x86) operat- +ing systems on Intel and other platforms. See the Copyright Notice. -The sources for XFree86 4.0.2 are available by anonymous ftp from: +The sources for XFree86 4.0.3 are available by anonymous ftp from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2 +ftp://ftp.XFree86.org/pub/XFree86/4.0.3 Binaries for OpenBSD/i386 2.8 and later are available from: -ftp://ftp.XFree86.org/pub/XFree86/4.0.2/binaries/OpenBSD +ftp://ftp.XFree86.org/pub/XFree86/4.0.3/binaries/OpenBSD A list of mirror sites is provided by http://www.xfree86.org/MIRRORS.shtml @@ -33,10 +32,16 @@ 3. New OS dependent features -See the Release Notes for non-OS dependent new features in XFree86 4.0.2. +See the Release Notes for non-OS dependent new features in XFree86 4.0.3. -3.1 New OS dependent features in 4.0.2 +3.1 New OS dependent features in 4.0.3 + o Support for the wscons console driver in post 2.8 OpenBSD. + + o A fix for multi-threaded libraries support. + +3.2 New OS dependent features in 4.0.2 + o Support for the OpenBSD ports tree, o Preliminary support for the powerpc architecture (clients build and @@ -46,7 +51,7 @@ o startx now creates an Xauthority magic cookie for the display. -3.2 New OS dependent features in 4.0.1 +3.3 New OS dependent features in 4.0.1 o Several features from the OpenBSD X11 tree were merged into xdm: @@ -65,21 +70,21 @@ o The Xsun server can be built again on OpenBSD/sparc. -3.3 New OS dependent features in 4.0 +3.4 New OS dependent features in 4.0 o Multi-thread safe libraries are built by default on OpenBSD 2.6 and later, o Preliminary APM support. -3.4 New OS dependent features in 3.9.18 +3.5 New OS dependent features in 3.9.18 o Support for USB mices has been added on OpenBSD. o Soft-booting secondary cards through the int10 BIOS interface is now possible using the x86emu real mode emulator. -3.5 New OS dependent features in 3.9.17 +3.6 New OS dependent features in 3.9.17 o Silken mouse is supported for serial mices, and, under post 2.6 OpenBSD- current for PS/2 mices. @@ -92,8 +97,8 @@ 5. Configuring X for Your Hardware -The /etc/XF86Config file tells the X server what kind of monitor, video card -and mouse you have. You must create it to tell the server what specific +The /etc/X11/XF86Config file tells the X server what kind of monitor, video +card and mouse you have. You must create it to tell the server what specific hardware you have. You'll need info on your hardware: @@ -104,6 +109,11 @@ o Your monitor's sync frequencies. +The recommended way to generate an XF86Config file is to use the xf86cfg +utility. The xf86config text utility is still there for the (few) cases +where xf86cfg can't be used. Also, there is a sample file installed as +/usr/X11R6/lib/X11/XF86Config.eg, which can be used as a starting point. + For details about the XF86Config file format, refer to the XF86Config(5) man- ual page. @@ -112,8 +122,10 @@ 5.1 About mouse configuration -If your serial mouse does not work try using kermit or tip to connect to the -mouse serial port and verify that it does indeed generate characters. +XFree86 4.0.3 has support for the mouse driver included in the new wscons +console driver introduced by OpenBSD-current after 2.8. Specify ``wsmouse'' +as the protocol and ``/dev/wsmouse0'' as the device in /etc/X11/XF86Config +if you're using OpenBSD-current with a PS/2 mouse. The OpenBSD pms driver provides both ``raw'' and ``cooked'' (translated) modes. ``raw'' mode does not do protocol translation, so XFree86 would use @@ -167,9 +179,12 @@ The server supports the two standard OpenBSD/i386 console drivers: pcvt and pccons. They are detected at runtime and no configuration of the server itself is required. + +The pcvt console driver is the default in OpenBSD up to OpenBSD 2.8. It +offers several virtual consoles and international keyboard support. -The pcvt console driver is the default in OpenBSD. It offers several virtual -consoles and international keyboard support. +OpenBSD-current after 2.8 has switched to the wscons console driver. This +console driver has a pcvt compatibility mode for X support. 7.2 Aperture Driver @@ -219,6 +234,14 @@ else return -1; +In post 2.8 OpenBSD-current, a modified version of this patch has been inte- +grated. You should set + + machdep.allowaperture=2 + +in /etc/sysctl.conf in order to achieve this. See the xf86(4) manual page for +details. + Another (less recommended) way to enable linear memory and I/O ports access is to disable the kernel security feature by adding ``option INSECURE'' in your kernel configuration file and build a new kernel. You will also need to @@ -279,11 +302,22 @@ to xc/config/host.def before rebuilding the server. This has not been thor- oughly tested, except on the macppc. +For the i386, you should include both pcvt and wscons support in order to use +the pcvt compatibility mode of wscons: + + #define XFree86ConsoleDefines -DPCVT_SUPPORT -DWSCONS_SUPPORT + 8.2 Building on other architectures XFree86 should also compiles on other OpenBSD architectures. However, please note that 3.9.x snapshots have only been tested on the i386 for now. +Note that OpenBSD project has now its own source tree, based on the XFree86 +source tree, with some local modifications. You may want to start with this +tree to rebuild from sources. The OpenBSD X11 source tree is available by +anoncvs from all OpenBSD anoncvs servers. See http://www.openbsd.org/anon- +cvs.html for details on anoncvs. + 9. Building New X Clients The easiest way to build a new client (X application) is to use xmkmf if an @@ -298,7 +332,7 @@ particular, David Dawes, Pace Willison, Amancio Hasty, Christoph Robitschko, Nate Williams, Rod Grimes, Jack Velte and Michael Smith. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.15 2000/12/12 18:54:29 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.15.2.2 2001/03/16 15:57:43 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD,v 1.20 2000/12/12 19:04:02 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD,v 1.20.2.3 2001/03/16 16:01:14 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.SiS diff -u xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.16 xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.16.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.16 Fri Dec 1 14:47:48 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.SiS Tue Mar 13 12:19:28 2001 @@ -113,4 +113,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.7 2000/03/06 22:59:24 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SiS,v 3.16 2000/12/01 19:47:48 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SiS,v 3.16.2.1 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.apm diff -u xc/programs/Xserver/hw/xfree86/doc/README.apm:1.8 xc/programs/Xserver/hw/xfree86/doc/README.apm:1.8.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.apm:1.8 Fri Dec 1 14:47:48 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.apm Tue Mar 13 12:19:28 2001 @@ -111,4 +111,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.apm,v 1.8 2000/12/01 19:47:48 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.apm,v 1.8.2.1 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.ati diff -u xc/programs/Xserver/hw/xfree86/doc/README.ati:3.53 xc/programs/Xserver/hw/xfree86/doc/README.ati:3.53.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.ati:3.53 Thu Dec 7 10:48:14 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.ati Tue Mar 13 12:19:28 2001 @@ -676,4 +676,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.34 2000/12/07 15:43:41 tsi Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.53 2000/12/07 15:48:14 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.53.2.1 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.chips diff -u xc/programs/Xserver/hw/xfree86/doc/README.chips:3.35 xc/programs/Xserver/hw/xfree86/doc/README.chips:3.35.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.chips:3.35 Mon Dec 4 14:47:24 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.chips Tue Mar 13 12:19:28 2001 @@ -7,7 +7,7 @@ 1. Introduction -With the release of XFree86 version 4.0.2, the Chips and Technologies driver +With the release of XFree86 version 4.0.3, the Chips and Technologies driver has been extensively rewritten and contains many new features. This driver must be considered work in progress, and those users wanting stability are encouraged to use the older XFree86 3.3.x versions. However this version of @@ -829,7 +829,7 @@ startx -- -depth 24 -fbbpp 32 8-8-8 RGB truecolor - however as XFree86 version 4.0.2 allows 32bpp pixmaps to be used + however as XFree86 version 4.0.3 allows 32bpp pixmaps to be used with framebuffers operating in 24bpp, this mode of operating will cost performance for no gain in functionality. @@ -902,4 +902,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.33 2000/12/02 21:52:22 dbateman Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.chips,v 3.35 2000/12/04 19:47:24 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.chips,v 3.35.2.1 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.cyrix diff -u xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.8 xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.8.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.8 Fri Dec 1 14:47:49 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.cyrix Tue Mar 13 12:19:28 2001 @@ -50,4 +50,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cyrix,v 1.8 2000/12/01 19:47:49 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cyrix,v 1.8.2.1 2001/03/13 17:19:28 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.fonts diff -u xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.15 xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.15.2.2 --- xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.15 Fri Dec 15 15:22:16 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.fonts Tue Mar 13 12:19:29 2001 @@ -2,7 +2,7 @@ Juliusz Chroboczek, - 14 December 2000 + 21 January 2001 1. Introduction @@ -238,7 +238,7 @@ included in modules that are loaded at runtime. The modules to be loaded are specified in the `XF86Config' file using the `Load' directive: - Load "Type1" + Load "type1" If you have trouble installing fonts in a specific format, you may want to check the server's log file in order to see whether the relevant modules are @@ -247,14 +247,16 @@ o "bitmap": bitmap fonts (`*.bdf', `*.pcf' and `*.snf'); - o "Type1": Type 1 fonts (`*.pfa' and `*.pfb') and CIDFonts; + o "type1": Type 1 fonts (`*.pfa' and `*.pfb') and CIDFonts; - o "Speedo": Bitstream Speedo fonts (`*.spd'); + o "speedo": Bitstream Speedo fonts (`*.spd'); o "freetype": TrueType fonts (`*.ttf' and `*.ttc'); o "xtt": alternate TrueType backend (`*.ttf' and `*.ttc'). +Please note that the argument of the `Load' directive is case-sensitive. + 3. Fonts included with XFree86 3.1 Standard bitmap fonts @@ -1008,7 +1010,7 @@ world, often provide interesting information about character set issues; my favourite is RFC 373. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.11 2000/12/15 20:01:56 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.11.2.1 2001/02/28 20:06:21 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.15 2000/12/15 20:22:16 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.15.2.2 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.i740 diff -u xc/programs/Xserver/hw/xfree86/doc/README.i740:1.8 xc/programs/Xserver/hw/xfree86/doc/README.i740:1.8.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.i740:1.8 Fri Dec 1 14:47:49 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.i740 Tue Mar 13 12:19:29 2001 @@ -178,4 +178,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.3 2000/03/04 00:26:30 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i740,v 1.8 2000/12/01 19:47:49 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i740,v 1.8.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.i810 diff -u xc/programs/Xserver/hw/xfree86/doc/README.i810:1.5 xc/programs/Xserver/hw/xfree86/doc/README.i810:1.5.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.i810:1.5 Fri Dec 1 14:47:49 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.i810 Tue Mar 13 12:19:29 2001 @@ -107,4 +107,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i810.sgml,v 1.2 2000/03/04 00:00:30 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i810,v 1.5 2000/12/01 19:47:49 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i810,v 1.5.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.isc diff -u xc/programs/Xserver/hw/xfree86/doc/README.isc:3.39 xc/programs/Xserver/hw/xfree86/doc/README.isc:3.39.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.isc:3.39 Fri Dec 1 14:47:50 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.isc Tue Mar 13 12:19:29 2001 @@ -489,4 +489,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.24 2000/03/06 22:59:25 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.39 2000/12/01 19:47:50 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.39.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.mouse diff -u xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.11 xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.11.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.11 Fri Dec 1 14:47:50 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.mouse Tue Mar 13 12:19:29 2001 @@ -6,7 +6,7 @@ 1. Introduction -This document describes mouse support in XFree86 4.0.2. +This document describes mouse support in XFree86 4.0.3. Mouse configuration has often been mysterious task for novice users. How- ever, once you learn several basics, it is straightforward to write the mouse @@ -928,4 +928,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.11 2000/03/01 00:25:23 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.mouse,v 1.11 2000/12/01 19:47:50 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.mouse,v 1.11.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.newport diff -u xc/programs/Xserver/hw/xfree86/doc/README.newport:1.2 xc/programs/Xserver/hw/xfree86/doc/README.newport:1.2.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.newport:1.2 Tue Dec 12 14:04:03 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.newport Tue Mar 13 12:19:29 2001 @@ -41,4 +41,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.2 2000/12/12 18:54:29 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.newport,v 1.2 2000/12/12 19:04:03 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.newport,v 1.2.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.r128 diff -u xc/programs/Xserver/hw/xfree86/doc/README.r128:1.13 xc/programs/Xserver/hw/xfree86/doc/README.r128:1.13.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.r128:1.13 Fri Dec 1 14:47:51 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.r128 Tue Mar 13 12:19:29 2001 @@ -119,4 +119,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.8 2000/06/14 00:16:09 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.r128,v 1.13 2000/12/01 19:47:51 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.r128,v 1.13.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.rendition diff -u xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.12 xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.12.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.12 Fri Dec 1 14:47:51 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.rendition Tue Mar 13 12:19:29 2001 @@ -145,4 +145,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 2000/06/17 02:30:33 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rendition,v 1.12 2000/12/01 19:47:51 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rendition,v 1.12.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/README.s3virge diff -u xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.6 xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.6.2.1 --- xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.6 Fri Dec 1 14:47:51 2000 +++ xc/programs/Xserver/hw/xfree86/doc/README.s3virge Tue Mar 13 12:19:29 2001 @@ -6,7 +6,7 @@ 1. Supported hardware -The s3virge driver in XFree86 4.0.2 supports the S3 ViRGE, ViRGE DX, GX, MX, +The s3virge driver in XFree86 4.0.3 supports the S3 ViRGE, ViRGE DX, GX, MX, MX+, and VX chipsets. A majority of testing is done on ViRGE DX chips, mak- ing them the most stable to date. This release has improved support for ViRGE GX2 stability, XVideo support for ViRGE DX (tested) and ViRGE @@ -63,4 +63,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.3 2000/11/28 20:59:17 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.s3virge,v 1.6 2000/12/01 19:47:51 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.s3virge,v 1.6.2.1 2001/03/13 17:19:29 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/RELNOTES diff -u xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.96 xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.96.2.3 --- xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.96 Mon Dec 18 00:55:38 2000 +++ xc/programs/Xserver/hw/xfree86/doc/RELNOTES Fri Mar 16 11:01:14 2001 @@ -1,23 +1,23 @@ - Release Notes for XFree86[tm] 4.0.2 + Release Notes for XFree86[tm] 4.0.3 The XFree86 Project, Inc - 17 December 2000 + 16 March 2001 Abstract This document contains some information about the features present - in XFree86 4.0.2 and their status. + in XFree86 4.0.3 and their status. 1. Introduction to the 4.x Release Series -XFree86 4.0 was the first official release of the new XFree86 4 series. The -current release (4.0.2) is the latest in that series. XFree86 4 represents a -significant redesign of the XFree86 X server. Not all of the hardware -drivers from 3.3.x have been ported to 4.x yet, but conversely, 4.x has some -hardware support not present in 3.3.x. Our Driver Status document summarizes -how the hardware driver support compares between 3.3.6 and 4.0.2. Please -check there first before downloading 4.0.2. +XFree86 4.0 was the first official release of the new XFree86 4 series. +XFree86 4.0.3 is the first update to 4.0.2, which is the latest full release +in that series. XFree86 4 represents a significant redesign of the XFree86 X +server. Not all of the hardware drivers from 3.3.x have been ported to 4.x +yet, but conversely, 4.x has some hardware support not present in 3.3.x. Our +Driver Status document summarizes how the hardware driver support compares +between 3.3.6 and 4.0.3. Please check there first before downloading 4.0.3. The 4.0.1 release introduced a new graphical configuration tool, "xf86cfg", and a text mode interface was added to it for the 4.0.2 release. It is work @@ -28,7 +28,7 @@ for some hardware. To try it out, just run (as root) "XFree86 -configure". Each of these configuration options will give you a reasonable starting point for a suitable configuration file. We've put some effort into documenting -the 4.0.2 config file format, and you can find that information in the +the 4.0.3 config file format, and you can find that information in the XF86Config manual page. Check that, the driver manual pages and the related documentation for further information. @@ -37,15 +37,81 @@ save you some time and help you figure out which of the binary releases you need. -The next section describes what is new in the latest version (4.0.2). The -other sections below describe some of the new features and changes between -3.3.x and 4.0. There are lot's of new features, and we definitely don't have -enough space to cover them all here. +The next sections describe what has changed in the update release(s) as well +as what is new in the latest full release (4.0.2). The other sections below +describe some of the new features and changes between 3.3.x and 4.0. There +are lot's of new features, and we definitely don't have enough space to cover +them all here. -2. Summary of new features in 4.0.2. +2. Summary of updates in 4.0.3. -2.1 X server + o Some temporary file-related security vulnerabilities are fixed. + o Screen corruption problems and palette saving problems with some Neo- + magic chips are fixed. + + o 'XFree86 -configure' problems are fixed in some drivers (including sis + and i810). + + o A problem with some plain S3 ViRGE cards is fixed. + + o Some Xaw incompatibilities with Xaw6 are fixed. + + o Some XKB files are updated. + + o Some trident driver updates, including fixing acceleration for the + Cyber9388. + + o A palette saving problem in the vgahw module is fixed. + + o Support for the wsmouse protocol is added for OpenBSD/i386. + + o A load problem with the sis driver module, and some depth 24 problems + are fixed. + + o Support for the "PD" variant of the ATI Rage 128 is added. + + o Support for GNU Hurd is updated. + + o Some TrueType font problems are fixed. + + o The mga driver doesn't attempt to drive the G450 if the "mga_hal" module + isn't available. + + o A problem with bold font simulation in xterm is fixed. + + o The (DPS) stub files created by pswrap are now compatible with the Adobe + version. + + o Some glint driver problems are fixed. + + o Support for building on OpenBSD-current, and multi-thread support for + OpenBSD are provided. + + o A problem with the ThinkingMousePS/2 protocol is fixed in the mouse + driver. + + o Support for the Render extension with Xinerama is added. + + o A DGA-related server crash is fixed. + + o Some Chips & Technologies driver bugs are fixed. + + o Some tseng driver bugs are fixed. + + o Some Alpha platform updates are included. + + o Support for the GeForce3 is added to the nv driver. + + o Misc build-related issues are fixed. + + o Various documentation updates, including a reworked XFree86(1) manual + page. + +3. Summary of new features in 4.0.2. + +3.1 X server + o Darwin/Mac OS X is now supported and the X server runs on PowerPC. The X server for this platform is called "Xdarwin", and its installation and configuration is different from the "XFree86" server used on other plat- @@ -115,7 +181,7 @@ o Big endian problems in Xinerama have been fixed. - o The new "render" extension has been added (see below (section 4.11, page + o The new "render" extension has been added (see below (section 5.11, page 1)). The design has been extended in the following ways: o A new FillRectangles request was added. @@ -234,10 +300,10 @@ some of the bugs in the current options. A protocol for plugging in external modules is also planned. -2.2 X libraries and clients. +3.2 X libraries and clients. o Significant updates to the internationalisation support in Xlib (see - below (section 2.3, page 1)). + below (section 3.3, page 1)). o Some xfs updates, including font path verification, and new options. @@ -245,7 +311,7 @@ o New "xvinfo" client for querying the XVideo extension. -2.3 Fonts and Internationalisation +3.3 Fonts and Internationalisation o Many of the "misc" bdf fonts have been updated and extended, and a wider range of ISO-8859 subsets have been added. These are now auto-generated @@ -274,7 +340,7 @@ o XKB keyboard definitions have been added and updated for some countries. -2.4 Platforms +3.4 Platforms o Darwin/Mac OS X. @@ -285,11 +351,11 @@ o Support has been added for more Alpha platforms under Linux. This now includes all platforms that require sparse memory mapping. -3. Drivers +4. Drivers -3.1 Video Drivers +4.1 Video Drivers -XFree86 4.0.2 includes the following video drivers: +XFree86 4.0.3 includes the following video drivers: +--------------+--------------------------+----------------------------------+ |Driver Name | Description | Further Information | @@ -341,9 +407,9 @@ Darwin/Mac OS X uses IOKit drivers and does not use the module loader drivers listed above. Further information can be found in README.Darwin. -XFree86 4.0.2 includes the following input drivers: +XFree86 4.0.3 includes the following input drivers: -3.2 Input Drivers +4.2 Input Drivers +------------+--------------------+---------------------+ |Driver Name | Description | Further Information | @@ -364,21 +430,21 @@ |wacom | Wacom tablets | wacom(4) | +------------+--------------------+---------------------+ -4. Summary of XFree86 4. +5. Summary of XFree86 4. Unlike XFree86 3.3.x where there are multiple X server binaries, each of -which drive different hardware, XFree86 4.0.2 has a single X server binary +which drive different hardware, XFree86 4.0.3 has a single X server binary called XFree86. This binary can either have one or more video drivers linked in statically, or, more usually, dynamically load the video drivers and other modules that are needed. -XFree86 4.0.2 has X server support for most UNIX(R) and UNIX-like operating +XFree86 4.0.3 has X server support for most UNIX(R) and UNIX-like operating systems on Intel/x86 platforms, plus support for Linux on Alpha, PowerPC, IA-64, Sparc, and Mips platforms, and for Darwin on PowerPC. Work on support for additional architectures and operating systems is in progress, and is planned for future releases. -4.1 Loader and Modules +5.1 Loader and Modules The XFree86 X server has a built-in run-time loader, donated by Metro Link . This loader can load normal object files and @@ -394,7 +460,7 @@ the future we plan to take advantage of this to provide more frequent driver module updates in between major releases. -The loader in version 4.0.2 has support for Intel (x86), Alpha and PowerPC +The loader in version 4.0.3 has support for Intel (x86), Alpha and PowerPC platforms. It also has preliminary support for Sparc platforms. The X server makes use of modules for video drivers, X server extensions, @@ -416,7 +482,7 @@ hope to have a mechanism for signing/verifying the modules that we provide available in a future release. -4.2 Configuration File +5.2 Configuration File The X server configuration file format has been extended to handle some of the new functionality. The xf86config utility can be used to generate a @@ -576,7 +642,7 @@ and /usr/X11R6/etc/X11 being added. The full search path details are docu- mented in the XF86Config manual page. -4.3 Command Line Options +5.3 Command Line Options The following new X server command line options have been added: @@ -687,13 +753,13 @@ This makes it possible for users to choose from multiple config files that the the sysadmin has provided. -4.4 XAA +5.4 XAA The XFree86 Acceleration Architecture (XAA) has been completely rewritten from scratch for XFree86 4.x. Most drivers implement acceleration by making use of the XAA module. -4.5 Multi-head +5.5 Multi-head Some multi-head configurations are supported in XFree86 4.x, primarily with multiple PCI/AGP cards. However, this is an area that is still being worked @@ -709,7 +775,7 @@ which card is the primary card (either by using a different PCI slot, or by changing the system BIOS's preference for the primary card). -4.6 Xinerama +5.6 Xinerama Xinerama is an X server extension that allows multiple physical screens to behave as a single screen. With traditional multi-head in X11, windows can- @@ -731,14 +797,14 @@ an issue that needs to be dealt with in the individual window managers, and isn't specifically an XFree86 problem. -4.7 DGA version 2 +5.7 DGA version 2 -DGA 2.0 is included in 4.0.2, but is not implemented by all drivers. Prelim- +DGA 2.0 is included in 4.0.3, but is not implemented by all drivers. Prelim- inary documentation for the client libraries can be found in the README.DGA document. A good degree of backwards compatibility with version 1.0 is pro- vided. -4.8 DDC +5.8 DDC The VESA(R) Display Data Channel (DDC[tm]) standard allows the monitor to tell the video card (or on some cases the computer directly) about itself; @@ -760,7 +826,7 @@ the X server, or by specifying appropriate screen dimensions with the "Dis- playSize" keyword in the "Monitor" section of the config file. -4.9 GLX and the Direct Rendering Infrastructure (DRI) +5.9 GLX and the Direct Rendering Infrastructure (DRI) Precision Insight (now part of the Pro- fessional Services group at VA Linux Systems ) @@ -781,7 +847,7 @@ drivers can be found at the DRI Project on SourceForge . -4.10 XVideo Extension (Xv) +5.10 XVideo Extension (Xv) The XVideo extension is supported in XFree86 4.x. An XvQueryPortAttributes function has been added as well as support for XvImages. XvImages are XIm- @@ -789,7 +855,7 @@ through shared memory segments. This allows clients to display YUV data with high quality hardware scaling and filtering. -4.11 X Rendering Extension (Render) +5.11 X Rendering Extension (Render) The X Rendering extension provides a 2D rendering model that more closely matches application demands and hardware capabilities. It provides a render- @@ -801,7 +867,7 @@ overlays and other image operations not possible with the core X rendering system. -XFree86 4.0.2 provides a partial implementation of Render sufficient for +XFree86 4.0.3 provides a partial implementation of Render sufficient for drawing anti-aliased text and image composition. Still to be implemented are geometric primitives and affine transformation of images. @@ -811,7 +877,7 @@ access to the available font information while still providing hardware acceleration. The Xft library provides font access for Render applications. -4.11.1 The Xft Library +5.11.1 The Xft Library On the client side, the Xft library provides access to fonts for applications using the FreeType library, version 2. FreeType currently supports Type1 and @@ -833,9 +899,9 @@ cated font aliasing mechanism. Documentation for that file is included in the Xft man page. -4.11.2 Building FreeType support for Xft +5.11.2 Building FreeType support for Xft -XFree86 4.0.2 includes sources for FreeType version 2.0.1, but they are not +XFree86 4.0.3 includes sources for FreeType version 2.0.1, but they are not built and installed automatically. As a result, Xft is configured to provide only core fonts by default. @@ -853,9 +919,9 @@ Finally, build XFree86 with "make World" from the top. -4.11.3 Application Support For Anti-Aliased Text +5.11.3 Application Support For Anti-Aliased Text -Only three applications have been modified in XFree86 4.0.2 to work with the +Only three applications have been modified in XFree86 4.0.3 to work with the Render extension and the Xft and FreeType libraries to provide anti-aliased text. Xterm, xditview and x11perf. Migration of other applications may occur in future releases. @@ -874,7 +940,7 @@ through the Render extension, a path which has not been optimized within the X server yet. -4.12 Other extensions +5.12 Other extensions The XFree86-Misc extension has not been fully ported to the new server archi- tecture yet. This should be completed in a future release. @@ -887,7 +953,7 @@ 3.3.x version of the extension is provided. The missing parts of this exten- sion and some new features should be completed in a future release. -4.13 Xaw +5.13 Xaw Two versions of the Xaw library are provided with XFree86 4.x. A version with bug fixes and a few binary compatible improvements and a new version with @@ -946,11 +1012,11 @@ o Several bugs were fixed in the text code, while some code was rewritten from scratch. -4.14 Xpm +5.14 Xpm Version 3.4k of the Xpm (X pixmap) library is now integrated into XFree86. -4.15 xedit +5.15 xedit Xedit have been changed to use most of the new features added to the new ver- sion of the Xaw library, and some xedit only features were added. Emacs users @@ -989,18 +1055,18 @@ o C-mode: this mode is expected to be stable, and fully usable. -4.16 Font support +5.16 Font support Details about the font support in XFree86 4.x can be found in the README.fonts document. -4.17 TrueType support +5.17 TrueType support XFree86 4.x comes with two TrueType backends, known as `xfsft' (the "freetype" module) and `X-TrueType' (the "xtt" module). Both of these back- ends are based on the FreeType library. -4.18 CID font support +5.18 CID font support Support for CID-keyed fonts is included in XFree86 4.x. The CID-keyed font format was designed by Adobe Systems for fonts @@ -1008,7 +1074,7 @@ by SGI . See the LICENSE document for a copy of the CID Font Code Public License. -4.19 Internationalisation of the scalable font backends +5.19 Internationalisation of the scalable font backends XFree86 4.x has a ``fontenc'' layer to allow the scalable font backends to use a common method of font re-encoding. This re-encoding makes it possible @@ -1017,14 +1083,14 @@ TrueType backend. The `X-TrueType' version of the TrueType backend uses a different re-encoding method based on loadable encoding modules. -4.20 Large font optimisation +5.20 Large font optimisation The glyph metrics array, which all the X clients using a particular font have access to, is now placed in shared memory, so as to reduce redundant memory consumption. For non-local clients, the glyph metrics array is transmitted in a compressed format. -4.21 Unicode/ISO 10646 support +5.21 Unicode/ISO 10646 support What is included in 4.x: @@ -1057,7 +1123,7 @@ o Both the xfsft (the "freetype" module) and the X-TrueType (the "xtt" module) TrueType font backends support Unicode-encoded fonts. -4.22 Lucidux fonts from Bigelow and Holmes +5.22 Lucidux fonts from Bigelow and Holmes XFree86 now includes the ``Lucidux'' family of professionally hinted Type 1 fonts. This family consists of the fonts ``Lucidux Serif'', ``Lucidux Sans'' @@ -1070,7 +1136,7 @@ or , or consult Y&Y's web site . -4.23 Directory rearrangements +5.23 Directory rearrangements Some changes to the installed XFree86 directory structure have been imple- mented for 4.x. One important change is a modified search path for the X @@ -1081,7 +1147,7 @@ located under the appropriate subdirectories of /var, again with the relevant symbolic links in the old location. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.58 2000/12/17 23:01:10 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.58.2.2 2001/03/16 15:57:44 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.96 2000/12/18 05:55:38 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.96.2.3 2001/03/16 16:01:14 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/Status diff -u xc/programs/Xserver/hw/xfree86/doc/Status:1.21 xc/programs/Xserver/hw/xfree86/doc/Status:1.21.2.3 --- xc/programs/Xserver/hw/xfree86/doc/Status:1.21 Thu Dec 14 17:34:26 2000 +++ xc/programs/Xserver/hw/xfree86/doc/Status Fri Mar 16 11:01:14 2001 @@ -1,4 +1,4 @@ - Driver Status for XFree86[tm] 4.0.2 + Driver Status for XFree86[tm] 4.0.3 The XFree86 Project, Inc @@ -7,26 +7,28 @@ Abstract This document provides information about the status of the driver - and hardware support in XFree86 4.0.2 compared with that in XFree86 - 3.3.6. Please send updates for this document to - + and hardware support in XFree86 4.0.3 compared with that in XFree86 + 3.3.6. Unless otherwise stated, hardware is classified as "sup- + ported" if its driver provides basic 2D support. Support for addi- + tional features may or may not be present. Please send updates for + this document to 1. Introduction This document contains one section per vendor (organised alphabetically) for -each chipset family that is supported in XFree86 3.3.6 or XFree86 4.0.2. It +each chipset family that is supported in XFree86 3.3.6 or XFree86 4.0.3. It includes information about the status of the drivers and the hardware they support, including a comparison of the level of support between versions -3.3.6 and 4.0.2. +3.3.6 and 4.0.3. In XFree86 3.3.6, several X servers are available; much hardware uses the XF86_SVGA server, which has a set of driver modules that are built into it at compile time. In other cases, X servers for specific chips (or families of chips) are provided (such as XF86_AGX, XF86_Mach64, etc.). -In XFree86 4.0.2, there is only one X server, called "XFree86", which can +In XFree86 4.0.3, there is only one X server, called "XFree86", which can load driver modules at runtime. Thus there is no specific mention of a -server binary when 4.0.2 is discussed; only the XFree86 server is used. +server binary when 4.0.3 is discussed; only the XFree86 server is used. Third-party vendors (often the manufacturers of various video chipsets) may provide their own drivers for the XFree86 server, but these third-party mod- ules are beyond the scope of this document. @@ -42,7 +44,7 @@ Support (including acceleration) for Voodoo Banshee and Voodoo3 cards is provided by the XF86_SVGA server with the tdfx driver. - 4.0.2: + 4.0.3: Support for Voodoo Graphics and Voodoo 2 chips is available on platforms where Glide is available (Linux and FreeBSD(?)) and is provided by the "glide" driver (requires version 2.x of the Glide @@ -52,7 +54,7 @@ Voodoo4, and Voodoo5 is provided by the "tdfx" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 3. 3Dlabs @@ -62,14 +64,14 @@ ramdacs), Permedia with IBM RGB526 RAMDAC, and Permedia 2, 2a, 2v is provided by the XF86_3DLabs server. - 4.0.2: + 4.0.3: Support (including acceleration) for Permedia, Permedia 2, 2v, (and 2a?), Permedia 3, GLINT 500TX, GLINT MX, GLINT Gamma, and GLINT Delta coproc is provided by the "glint" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. The - Permedia 3 is only supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. The + Permedia 3 is only supported in 4.0.3. 4. Alliance @@ -77,14 +79,14 @@ Support (including acceleration) for the AT24, AP6422, AT3D. Support is provided by the XF86_SVGA server with the apm driver. - 4.0.2: + 4.0.3: Support (including acceleration?) for the AT24, AT25 and AT3D. This support is provided by the "apm" driver. This driver cur- rently has only incomplete support for the AP6422. Summary: - The AP6422 is supported in 3.3.6 but not fully in 4.0.2. The - AT25 is supported in 4.0.2 but not in 3.3.6. + The AP6422 is supported in 3.3.6 but not fully in 4.0.3. The + AT25 is supported in 4.0.3 but not in 3.3.6. 5. ARK Logic @@ -93,12 +95,12 @@ and ARK2000MT. Support is provided by the XF86_SVGA server with the ark driver. - 4.0.2: + 4.0.3: Support (including acceleration) for the ARK1000PV, ARK2000PV, and ARK2000MT. Support is provided by the "ark" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 6. ATI @@ -116,15 +118,15 @@ driver. Accelerated support is provided for the Rage 128 chips by the XF86_SVGA server with the r128 driver. - 4.0.2: + 4.0.3: Accelerated support is provided for Mach64, Rage, Rage 128 and Radeon chips. Unaccelerated support is provided for all of the others except the Mach8 and some early Mach32 chips by the "ati" driver. Summary: - All chips supported in 3.3.6 are supported in 4.0.2 except for - Mach8 and some old Mach32 chips. The support in 4.0.2 is, how- + All chips supported in 3.3.6 are supported in 4.0.3 except for + Mach8 and some old Mach32 chips. The support in 4.0.3 is, how- ever, unaccelerated for all chips except the Mach64, Rage and Rage 128 variants. @@ -137,12 +139,12 @@ the others. These drivers reportedly work, but they have no maintainer. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old drivers have not been ported. Summary: - No Avance Logic chips are supported in 4.0.2. + No Avance Logic chips are supported in 4.0.3. 8. Chips and Technologies @@ -152,13 +154,13 @@ 64300. This support is provided by the XF86_SVGA server with the chips driver. - 4.0.2: + 4.0.3: Support (accelerated) for the 65520, 65525, 65530, 65535, 65540, 65545, 65546, 65548, 65550, 65554, 65555, 68554, 69000, 64200 and 64300. This support is provided by the "chips" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 9. Cirrus Logic @@ -170,13 +172,13 @@ 7541, 7542, 7543, 7548, 7555 and 7556 is provided by the XF86_SVGA server with the cirrus driver. - 4.0.2: + 4.0.3: Support (accelerated) for the Alpine (5430, 5434, 5436, 5446, 5480, 7548), and Laguna (5462, 5464, 5465) chips is provided by the "cirrus" driver. Summary: - The following chips are supported in 3.3.6 but not in 4.0.2: + The following chips are supported in 3.3.6 but not in 4.0.3: 6410, 6412, 6420, 6440, 5420, 5422, 5424, 5426, 5428, 5429, 6205, 6215, 6225, 6235, 7541, 7542, 7543, 7555 and 7556. @@ -192,7 +194,7 @@ 24 plane 3D chips (on Alpha platforms) is provided by the XF86_TGA server. - 4.0.2: + 4.0.3: No support for the Compaq AVGA (driver hasn't been ported). Support (accelerated) for the DEC 21030 TGA 8 plane, 24 plane and @@ -200,8 +202,8 @@ the "tga" driver. Summary: - No Compaq AVGA support in 4.0.2. DEC TGA support is equivalent - in both 3.3.6 and 4.0.2. + No Compaq AVGA support in 4.0.3. DEC TGA support is equivalent + in both 3.3.6 and 4.0.3. 11. Cyrix @@ -209,12 +211,12 @@ Support (accelerated) for the Cyrix MediaGX is provided by the XF86_SVGA server with the cyrix driver. - 4.0.2: - The 3.3.6 driver has been ported to 4.0.2, including accelera- + 4.0.3: + The 3.3.6 driver has been ported to 4.0.3, including accelera- tion, but feedback is needed. Summary: - Cyrix MediaGX users are encouraged to test its support in 4.0.2. + Cyrix MediaGX users are encouraged to test its support in 4.0.3. 12. Epson @@ -222,12 +224,12 @@ Support (accelerated) for the Epson SPC8110 is provided by the XF86_SVGA server with the spc8100 driver. - 4.0.2: + 4.0.3: No native support for this chipset, because the old driver has not been ported. Summary: - No Epson chips are supported in 4.0.2. + No Epson chips are supported in 4.0.3. 13. Genoa @@ -237,12 +239,12 @@ because we don't have any recent test reports, and this driver has no maintainer. - 4.0.2: + 4.0.3: No native support for this chipset, because the old driver has not been ported. Summary: - No Genoa chips are supported in 4.0.2. + No Genoa chips are supported in 4.0.3. 14. IBM @@ -257,7 +259,7 @@ Support for the IBM XGA-2 chip is provided by the XF86_AGX server. - 4.0.2: + 4.0.3: Support for the standard IBM VGA chip (and compatibles) is pro- vided by the "vga" driver. @@ -266,7 +268,7 @@ Summary: The standard VGA core is supported in both versions, but there is - no support for the 8514/A or XGA-2 in 4.0.2. + no support for the 8514/A or XGA-2 in 4.0.3. 15. IIT @@ -274,12 +276,12 @@ Support (accelerated) for the AGX-016, AGX-015 and AGX-014 is provided by the XF86_AGX server. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old driver has not been ported. Summary: - No IIT chips are supported in 4.0.2. + No IIT chips are supported in 4.0.3. 16. Integrated Micro Solutions (IMS) @@ -287,12 +289,12 @@ Support (accelerated) for the IMS Twin Turbo 128 is provided by the XF86_SVGA server with the imstt driver. - 4.0.2: + 4.0.3: Support (accelerated) for the IMS Twin Turbo 128 is provided by the "imstt" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 17. Intel @@ -303,7 +305,7 @@ Linux, and requires the agpgart.o kernel module in order to use modes that require more than 1MB of video memory. - 4.0.2: + 4.0.3: Support (accelerated) for the Intel i740 is provided by the "i740" driver, and support for the Intel i810 is provided by the "i810" driver. The "i810" driver is currently Linux-only, and @@ -320,13 +322,13 @@ (Mystique), MGA2164W (Millennium II) (PCI and AGP), G100, G200 and G400 is provided by the XF86_SVGA server with the mga driver. - 4.0.2: + 4.0.3: Support (accelerated) for the MGA2064W (Millennium I), MGA1064SG (Mystique), MGA2164W (Millennium II) (PCI and AGP), G100, G200 and G400 is provided by the "mga" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 19. MX (???) @@ -336,12 +338,12 @@ is unknown because we don't have any recent test reports, and this driver has no maintainer. - 4.0.2: + 4.0.3: No native support for this chipset, because the old driver has not been ported. Summary: - No MX (???) chips are supported in 4.0.2. + No MX (???) chips are supported in 4.0.3. 20. NCR @@ -350,12 +352,12 @@ XF86_SVGA server and the ncr77c22 driver. The status of this support is unknown because we don't have any recent test reports. - 4.0.2: + 4.0.3: No native support for this chipset, because the old driver has not been ported. Summary: - No NCR chips are supported in 4.0.2. + No NCR chips are supported in 4.0.3. 21. NeoMagic @@ -364,14 +366,14 @@ NM2097, NM2160 and NM2200 chipsets is provided by the XF86_SVGA server with the neo driver. - 4.0.2: + 4.0.3: Support (accelerated) for the NeoMagic NM2070, NM2090, NM2093, NM2097, NM2160, NM2200, NM2230, NM2360 and NM2380 chipsets is provided by the "neomagic" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. The - NM2230 and later chips are only supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. The + NM2230 and later chips are only supported in 4.0.3. 22. NVIDIA @@ -380,15 +382,15 @@ (Ultra, Vanta, M64), GeForce (DDR, 256) and Quadro is provided by the XF86_SVGA server and the nv driver. - 4.0.2: + 4.0.3: Support (accelerated) for the Riva 128, 128ZX, TNT, TNT2 (Ultra, Vanta, M64), GeForce (DDR, 256), GeForce2 (GTS, Ultra, MX), - Quadro, and Quadro2 is provided by the "nv" driver. + Quadro, Quadro2, and GeForce3 is provided by the "nv" driver. Summary: All chipsets supported in 3.3.6 except the NV1 are also supported - in 4.0.2. Support for the newer chips (GeForce2 and later) is - only available in 4.0.2. + in 4.0.3. Support for the newer chips (GeForce2 and later) is + only available in 4.0.3. 23. Number Nine @@ -396,12 +398,12 @@ Support (accelerated) for the Imagine 128, Ticket 2 Ride, Revolu- tion 3D and Revolution IV is provided by the XF86_I128 server. - 4.0.2: + 4.0.3: Support (accelerated) for the Imagine 128, Ticket 2 Ride, Revolu- tion 3D and Revolution IV is provided by the "i128" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 24. Oak Technologies, Inc. @@ -410,12 +412,12 @@ acceleration) is provided by the XF86_SVGA server and the oak driver. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old driver has not been ported. Summary: - No Oak chips are supported in 4.0.2. + No Oak chips are supported in 4.0.3. 25. Paradise/Western Digital @@ -426,12 +428,12 @@ port for some of these chipsets is uncertain because we don't have any recent test reports, and this driver has no maintainer. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old driver has not been ported. Summary: - No Paradise/Western Digital chips are supported in 4.0.2. + No Paradise/Western Digital chips are supported in 4.0.3. 26. RealTek @@ -441,12 +443,12 @@ unknown because we don't have any recent test reports, and this driver has no maintainer. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old driver has not been ported. Summary: - No RealTek chips are supported in 4.0.2. + No RealTek chips are supported in 4.0.3. 27. Rendition/Micron @@ -454,12 +456,12 @@ Support for the Verite 1000, 2100 and 2200 is provided by the XF86_SVGA server with the rendition driver. - 4.0.2: + 4.0.3: Support for the Verite 1000, 2100 and 2200 is provided by the "rendition" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 28. S3 @@ -476,7 +478,7 @@ age2000, is provided by the XF86_SVGA server with the s3_savage driver on some OSes (Linux, *BSD). - 4.0.2: + 4.0.3: Support (accelerated) for the ViRGE, ViRGE/VX, ViRGE/DX, ViRGE/GX, ViRGE/GX2, ViRGE/MX, ViRGE/MX+, Trio3D and Trio3D/2X is provided by the "s3virge" driver. Support (accelerated) for the @@ -486,19 +488,19 @@ Summary: Only the ViRGE, Trio3D and Savage chipsets are supported in - 4.0.2. All of the other chipsets are only supported in 3.3.6. + 4.0.3. All of the other chipsets are only supported in 3.3.6. 29. Silicon Graphics, Inc. (SGI) 3.3.6: No SGI hardware is supported in 3.3.6. - 4.0.2: + 4.0.3: Unaccelerated support for the SGI Indy's Newport cards is pro- vided by the "newport" driver. Summary: - SGI hardware is supported only in 4.0.2. + SGI hardware is supported only in 4.0.3. 30. Silicon Integrated Systems (SiS) @@ -507,15 +509,15 @@ 86C225, 5597, 5598, 6326, 530, 620, 300, 630 and 540 is provided by the XF86_SVGA server with the sis driver. - 4.0.2: + 4.0.3: Support (accelerated) for the SiS 530, 620, 6326 is provided by the "sis" driver. The 630, 300, and 540 are also supported, but this code is new and there are some problems with it in this version. Summary: - Support for the 86C201, 86C202, 86C215, 86C225, 5597 and 5598 is - currently only available in 3.3.6. + Support for the 86C201, 86C202, 86C205, 86C215, 86C225, 5597 and + 5598 is currently only available in 3.3.6. 31. Silicon Motion, Inc. @@ -524,20 +526,20 @@ LynxEM+ and Lynx3DM chips is provided by the XF86_SVGA server with the smi driver. - 4.0.2: + 4.0.3: Support (accelerated) for the Lynx, LynxE, Lynx3D, LynxEM, LynxEM+ and Lynx3DM chips is provided by the "siliconmotion" driver. Summary: - All hardware supported in 3.3.6 is also supported in 4.0.2. + All hardware supported in 3.3.6 is also supported in 4.0.3. 32. Sun Microsystems 3.3.6: No Sun hardware is supported in 3.3.6. - 4.0.2: + 4.0.3: Sun BW2 framebuffers are supported by the "sunbw2" driver. Sun CG3 framebuffers are supported by the "suncg3" driver. Sun CG6 framebuffers are supported by the "suncg6" driver. Sun CG14 @@ -547,7 +549,7 @@ framebuffers are supported by the "suntcx" driver. Summary: - Sun hardware is supported only in 4.0.2. + Sun hardware is supported only in 4.0.3. 33. Trident Microsystems @@ -562,7 +564,7 @@ CyberBlade/DSTN/i7 and CyberBlade/i1 is provided by the XF86_SVGA server with the tvga8900 driver. - 4.0.2: + 4.0.3: Support (accelerated where the chip supports it) for the TVGA8900D, TGUI9440AGi, TGUI9660, TGUI9680, ProVidia 9682, Pro- Vidia 9685, Cyber9320, Cyber9382, Cyber9385, Cyber9388, @@ -574,10 +576,10 @@ Summary: The following (older) chipsets that are supported in 3.3.6 are - not supported in 4.0.2: TVGA8200LX, TVGA8800CS, TVGA8900B, + not supported in 4.0.3: TVGA8200LX, TVGA8800CS, TVGA8900B, TVGA8900C, TVGA8900CL, TVGA9000, TVGA9000i, TVGA9100B, TVGA9200CXr, TGUI9400CXi, TGUI9420, TGUI9430DGi. The remaining - listed chipsets are supported in 4.0.2. + listed chipsets are supported in 4.0.3. 34. Tseng Labs @@ -589,13 +591,13 @@ driver. Support (accelerated) for the ET4000/W32 series and the ET6000 is also provided by the deprecated XF86_W32 server. - 4.0.2: + 4.0.3: Support for the ET4000AX, and accelerated support for the ET4000/W32, ET4000/W32i, ET4000/W32p, ET6000 and ET6100 is pro- vided by the "tseng" driver. Summary: - All cards supported by 3.3.6 are also supported by 4.0.2 except + All cards supported by 3.3.6 are also supported by 4.0.3 except for the old ET3000. 35. Video 7 @@ -606,12 +608,12 @@ unknown because we don't have any recent test reports, and this driver has no maintainer. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old driver has not been ported. Summary: - No Video 7 chips are supported in 4.0.2. + No Video 7 chips are supported in 4.0.3. 36. Weitek @@ -620,14 +622,14 @@ server and accelerated support for the P9100 is provided by the XF86_SVGA server with the p9x00 driver. - 4.0.2: + 4.0.3: No native support for these chipsets, because the old drivers have not been ported. Summary: - No Weitek chips are supported in 4.0.2. + No Weitek chips are supported in 4.0.3. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.26 2000/12/14 22:15:48 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.26.2.3 2001/03/16 15:57:44 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/Status,v 1.21 2000/12/14 22:34:26 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/Status,v 1.21.2.3 2001/03/16 16:01:14 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/Versions diff -u /dev/null xc/programs/Xserver/hw/xfree86/doc/Versions:1.1.2.2 --- /dev/null Fri Mar 16 21:24:28 2001 +++ xc/programs/Xserver/hw/xfree86/doc/Versions Fri Mar 16 09:57:21 2001 @@ -0,0 +1,301 @@ + XFree86 Version Numbering Schemes + + The XFree86 Project, Inc + + 28 January 2001 + + Abstract + + The version numbering schemes used by XFree86 have changed from + time to time. The schemes used since version 3.3 are explained + here. + +1. Releases, Development Streams and Branches + +As of the release of version 4.0.2 in December 2000, XFree86 has three +release branches. The main development stream is on the trunk of the CVS +repository. That is where all new development work is done. A stable bugfix +branch for the 4.0.2 release was created at the time of its release, and that +branch is called "xf-4_0_2-branch". Fixes for bugs found in the 4.0.2 +release will be added to this branch (as well as the trunk). Similar stable +branches will be created after each full release. + +Finally, there is the 3.3.x legacy branch, which is called "xf-3_3-branch". +While this branch is not actively being maintained, it does include some +important post-3.3.6 bug fixes and security updates. Security updates in +particular are usually back-ported to this branch. + +XFree86 is planning to make full releases from the main development stream +approximately every six months, in late May and November of each year. The +feature freezes for these releases will be 1 April and 1 October respec- +tively. These are target dates, not a binding commitment. How effectively +these dates can be met will depend to a large degree on the resource avail- +able to XFree86. Full releases consist of full source code tarballs, plus +full binary distributions for a range of supported platforms. Update/bugfix +releases will be made on an as-required basis, depending also on the avail- +ability of resources. Update/bugfix releases will not be full releases, and +will consist of source code patches, plus binary updates to be layered on top +of the previous full release. + +The next full release will be version 4.1.0, scheduled for late May 2001. +The next update release will be 4.0.3. There is no specific schedule for +that, but it is expected to be available some time in February 2001. The +next release on the legacy branch will be 3.3.7. There is currently no +schedule for that release. The 3.3.7 release is likely to be the final +release on that branch. + +Aside from actual releases, snapshots of the active release branches are +tagged in the CVS repository from time to time. Each such snapshot has an +identifiable version number. + +2. Current (new) Version Numbering Scheme + +Starting with the main development branch after 4.0.2, the XFree86 versions +will be numbered according to the scheme outlined here. Both the 4.0.2 sta- +ble branch and the 3.3.x legacy branch will continue to use the previous +scheme, which is outlined in the sections below. + +The version numbering format is M.m.P.s, where M is the major version number, +m is the minor version number, P is the patch level, and s is the snapshot +number. Full releases have P set to zero, and it is incremented for each +subsequent bug fix release on the post-release stable branch. The snapshot +number s is present only for between-release snapshots of the development and +stable branches. + +2.1 Development Branch + +Immediately after forming a release stable branch, the patch level number for +the main development branch is bumped to 99, and the snapshot number is +reset. The snapshot number is incremented for each tagged development snap- +shot. The CVS tag for snapshots is "xf-M_m_P_s". When the development +branch enters feature freeze, the snapshot number is bumped to 900, and a +stable branch is created for the next full release. The branch is called +"xf-M_m-branch". The snapshot number is incremented from there until the +release is finalised. Each of these snapshots is a "release candidate". +When the release is finalised, the minor version is incremented, the patch +level is set to zero, and the snapshot number removed. + +Here's an example which shows the version number sequence for the development +leading up to version 4.1.0: + + 4.0.99.1 + The first snapshot of the pre-4.1 development branch. + + 4.0.99.23 + The twenty-third snapshot of the pre-4.1 development branch. + + 4.0.99.900 + The start of the 4.1 feature freeze, which marks the creation of + the "xf-4_1-branch" branch. That branch is the "stable" branch + for the 4.1.x releases. + + 4.0.99.903 + The third 4.1.0 release candidate. + + 4.1.0 + The 4.1.0 release. + + 4.1.99.1 + The first pre-4.2 development snapshot, which is the first main + branch snapshot after creating the 4.1 stable branch. + +2.2 Stable Branch + +After a full release, the stable branch for the release will be maintained +with bug fixes and important updates until the next full release. All snap- +shots on this branch are considered "release candidates", so the first is +indicated by setting s to 901. The snapshot number is then incremented for +each subsequent release candidate until the update release if finalised. The +patch level value (P) is incremented for each update release. + +Here's an example which shows the version number sequence for the 4.1.x sta- +ble branch. + + 4.0.99.900 + The start of the 4.1 feature freeze, which marks the creation of + the "xf-4_1-branch" branch. That branch is the "stable" branch + for the 4.1.x releases. + + 4.0.99.903 + The third 4.1.0 release candidate. + + 4.1.0 + The 4.1.0 release. + + 4.1.0.901 + The first pre 4.1.1 snapshot. + + 4.1.0.903 + The third pre 4.1.1 snapshot, also known as the third 4.1.1 + release candidate. + + 4.1.1 + The 4.1.1 release. + + 4.1.1.901 + The first pre 4.1.2 snapshot. + + 4.1.2 + The 4.1.2 release. + +3. Version Numbering Scheme for XFree86 4.0.x. + +The version numbering format for XFree86 4.0.x releases is M.m.nx, where M is +the major version number (4), m is the minor version number (0), n is the +sub-minor version number, and x is a letter. Full release versions up to and +including 4.0.2 were 4.0, 4.0.1, and 4.0.2. Between-release snapshots are +indicated by including x, a lower case letter. For example, the first +post-4.0.1 snapshot was 4.0.1a. Release candidates have been indicated by +setting x to a one or two letter combination with the first letter being "Z". +For example, 4.0.1Z was the first 4.0.2 release candidate. + +The next 4.0.x release will be an update release, not a full release. These +update releases will be indicated by incrementing the sub-minor version num- +ber. So, the first post-4.0.2 update release will be 4.0.3. Between-release +snapshots will continue to be indicated with a lower case letter, so the +first pre-4.0.3 snapshot will be 4.0.2a. + +The following example illustrates the release sequence from 4.0 through to +the post-4.0.2 update releases. + + 4.0 + The 4.0 release. + + 4.0a + The first post-4.0 development snapshot. + + 4.0f + The sixth post-4.0 development snapshot. + + 4.0Z + The 4.0.1 release candidate. + + 4.0.1 + The 4.0.1 release. + + 4.0.1a + The first post-4.0.1 development snapshot. + + 4.0.1f + The sixth post-4.0.1 development snapshot. + + 4.0Z + The first 4.0.2 release candidate. + + 4.0Zb + The third 4.0.2 release candidate. + + 4.0.2 + The 4.0.2 release. + + 4.0.2a + The first pre-4.0.3 snapshot/release candidate. + + 4.0.2c + The third pre-4.0.3 snapshot/release candidate. + + 4.0.3 + The 4.0.3 update release. + + 4.0.3a + The first pre-4.0.4 snapshot/release candidate. + + 4.0.4 + The 4.0.4 update release. + +4. Pre-4.0 Development Versions + +This section is included mostly for historical reasons. + +The development leading up to 4.0 started from version 3.2A, but much of it +happened on a separate development branch. The "new design" work on that +development branch was first folded into the main development branch at ver- +sion 3.9N. Up until the XFree86 CVS was made publicly available, all ver- +sions containing one or more letters were internal development snapshots. +The internal development snapshots continued through the following sequence: +3.9N, 3.9Na, ..., 3.9Nz, 3.9P, 3.9Pa, ..., 3.9Py, 3.9.15, 3.9.15a, ..., +3.9.16, 3.9.16a, ..., 3.9.17, 3.9.17a, ..., 3.9.18, 3.9.18a, ..., 4.0. The +3.9.15, 3.9.16, etc versions were public pre-4.0 beta releases. + +5. Version Numbering Scheme for XFree86 3.3.x. + +The version numbering format for XFree86 3.3.x releases is M.m.nx, where M is +the major version number (3), m is the minor version number (3), n is the +sub-minor version number, and x is a letter. Between-release snapshots are +indicated by including x, a lower case letter. An exception to this scheme +was the 3.3.3.1 release, which was an update to the 3.3.3 release. + + 3.3 + The 3.3 release. + + 3.3a + The first post-3.3 development snapshot. + + 3.3.1 + The 3.3.1 release. + + 3.3.1a + The first post-3.3.1 development snapshot. + + 3.3.2 + The 3.3.2 release. + + 3.3.2a + The first post-3.3.2 development snapshot. + + 3.3.3 + The 3.3.3 release. + + 3.3.3a + The first post-3.3.3 development snapshot. + + 3.3.3.1 + The 3.3.3.1 release. + + 3.3.3.1a + The first post-3.3.3.1 development snapshot. + + 3.3.4 + The 3.3.4 release. + + 3.3.4a + The first post-3.3.4 snapshot. + + 3.3.5 + The 3.3.5 release. + + 3.3.5a + The first post-3.3.5 snapshot. + + 3.3.6 + The 3.3.6 release. + + 3.3.6a + The first post-3.3.6 snapshot. + +6. Finding the XFree86 X Server Version From a Client + +The XFree86 X servers report a VendorRelease value that matches the XFree86 +version number. There have been some cases of releases where this value +wasn't set correctly. The rules for interpreting this value as well as the +known exceptions are outlined here. + +For 3.3.x versions, the VendorRelease value is Mmnp. That is, version +M.m.n.p has VendorRelease set to M * 1000 + m * 100 + n * 10 + p. Exceptions +to this are: The value wasn't incremented for the 3.3.3.1 release, and for +the 3.3.4 and 3.3.5 releases the value was incorrectly set to Mmn +(M * 100 + m * 10 + n). This was corrected for the 3.3.6 release. + +For versions 3.9.15 to 4.0.x, the VendorRelease value is Mmnn. That is, ver- +sion M.m.n has VendorRelease set to M * 1000 + m * 100 + n. There have been +no exceptions to this rule. + +For post-4.0.2 development and release versions using the new numbering +scheme, the VendorRelease value is MMmmPPsss. That is, version M.m.P.s has +VendorRelease set to M * 10000000 + m * 100000 + P * 1000 + s. Note: 4.0.3 +and any other 4.0.x releases will continue with the Mmnn scheme. + + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.1.2.1 2001/03/16 14:55:41 dawes Exp $ + + +$XFree86: xc/programs/Xserver/hw/xfree86/doc/Versions,v 1.1.2.2 2001/03/16 14:57:21 dawes Exp $ Index: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.39 xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.39.2.1 --- xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.39 Mon Dec 4 13:49:54 2000 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml Thu Feb 8 14:31:03 2001 @@ -36,7 +36,7 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39 2000/12/04 18:49:54 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39.2.1 2001/02/08 19:31:03 dawes Exp $ @@ -517,8 +517,8 @@ &s.code;InitOutput()&e.code;. &s.code;xf86AddDriver()&e.code; adds it to the global &s.code;xf86DriverList[]&e.code; array. - The &s.code;DriverRec&e.code; contains the driver's version, a short - descriptive message, the &s.code;Identify()&e.code;, + The &s.code;DriverRec&e.code; contains the driver canonical name, + the &s.code;Identify()&e.code;, &s.code;Probe()&e.code; and &s.code;AvailableOptions()&e.code; function entry points as well as a pointer to the driver's module (as returned from the loader when the driver @@ -6336,7 +6336,7 @@ DriverRec ZZZ = { VERSION, - "unaccelerated driver for ZZZ Zzzzzy cards", + ZZZ_DRIVER_NAME, ZZZIdentify, ZZZProbe, ZZZAvailableOptions, Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.69 xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.69.2.1 --- xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.69 Sun Dec 17 21:43:50 2000 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile Fri Mar 16 09:55:41 2001 @@ -3,7 +3,7 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.69 2000/12/18 02:43:50 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.69.2.1 2001/03/16 14:55:41 dawes Exp $ #include #include @@ -11,7 +11,7 @@ SGMLDEPENDS = defs.ent MANSGMLDEPENDS = mdefs.ent INDEXLIST = README.sgml RELNOTES.sgml Status.sgml LICENSE.sgml Install.sgml \ - DESIGN.sgml \ + DESIGN.sgml Versions.sgml \ mouse.sgml fonts.sgml DRI.sgml DRIcomp.sgml \ Darwin.sgml isc.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml \ OS2note.sgml \ @@ -111,6 +111,7 @@ /* Other docs */ LinuxDocReadmeTarget(fonts) LinuxDocReadmeTarget(mouse) +LinuxDocTarget(Versions) #ifdef OUTOFDATE LinuxDocTargetLong(VidModes.sgml,VideoModes.doc,VideoModes) LinuxDocTarget(xinput) Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.10 xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.10.2.2 --- xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.10 Fri Dec 15 14:09:06 2000 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml Wed Mar 14 13:23:45 2001 @@ -6,10 +6,10 @@ Installation Details for XFree86™ &relvers; <author>The XFree86 Project, Inc -<date>15 December 2000 +<date>2 March 2001 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.10 2000/12/15 19:09:06 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.10.2.2 2001/03/14 18:23:45 dawes Exp $ </ident> <abstract> @@ -36,7 +36,17 @@ <sect>Downloading the XFree86 &relvers; binaries <p> -We provide XFree86 &relvers; binaries for a range + +<![ %updaterel [ +XFree86 &relvers; is an update release. The most recent full release +(&fullrelvers;) needs to be installed before installing this update. +Information about downloading and installing &fullrelvers; can be found +in the installation document for that version, which can be found +on the <url name="XFree86 web site" +url="http://www.xfree86.org/pub/XFree86/&fullrelvers/Install.html">. +]]> + +We provide XFree86 &relvers; <![ %updaterel [update ]]>binaries for a range of operating systems at our <![ %snapshot; [ <url name="ftp site" @@ -80,11 +90,13 @@ and save the file under the name "<tt>Xinstall.sh</tt>". Once you're run the <tt>Xinstall.sh</tt> script and found which binary -distribution is suitable for your system, download the necessary files. -The twelve (12) mandatory files for all installations are listed below. -If you have not downloaded all of the files, the installer script will -complain. +<![ %updaterel; [update ]]>distribution is suitable for your system, +download the necessary files. The <![ %fullrel [twelve (12)]]><![ +%updaterel [five (5)]]> mandatory files for all installations are listed +below. If you have not downloaded all of the files, the installer script +will complain. +<![ %fullrel [ <quote><verb> 1. Xinstall.sh The installer script 2. extract The utility for extracting tarballs @@ -99,6 +111,17 @@ 11. Xxserv.tgz XFree86 X server 12. Xmod.tgz XFree86 X server modules </verb></quote> +]]> + +<![ %updaterel [ +<quote><verb> +1. Xinstall.sh The installer script +2. extract The utility for extracting tarballs +3. Xupdate.tgz Updated files except X server drivers/modules +4. Xdocupd.tgz Updated documentation +5. Xdrivers.tgz Updated X server drivers +</verb></quote> +]]> NOTES: <itemize> @@ -107,18 +130,22 @@ version called <tt>extract.exe</tt> instead. This should fix the problem. (This is not a DOS/Windows executable.) +<![ %fullrel [ <item>A few distributions don't have or require the <tt>Xvar.tgz</tt> tarball. If it is present in the <tt>binaries</tt> sub-directory for your platform, then it is required. +]]> <item>The Darwin/Mac OS X distribution doesn't have or require the - <tt>Xmod.tgz</tt> tarball. + <![ %fullrel [<tt>Xmod.tgz</tt>]]><![ %updaterel + [<tt>Xdrivers.tgz</tt>]]> tarball. <item>Some distributions may have additional mandatory tarballs. While rare, the installer script will tell you if any are missing. </itemize> +<![ %fullrel [ The following thirteen (13) tarballs are optional. You should download the ones you want to install. @@ -146,15 +173,22 @@ If you miss some and want to install them later, go to the <ref id="manual-install" name="Manual Installation"> section. +]]> <sect>Installing XFree86 &relvers; using the <tt>Xinstall.sh</tt> script <p> We strongly recommend that our XFree86 &relvers; binaries be installed -using the <tt>Xinstall.sh</tt> script that we provide. There are a lot of +using the <tt>Xinstall.sh</tt> script that we provide. +<![ %updaterel [It is also important that the previous full release +(&fullrelvers;) is installed before installing this update release. +Make sure that you use the &relvers; version of the <tt>Xinstall.sh</tt> +script to install this update. Older versions may not be able to do it +correctly.]]> +There are a lot of steps in the manual installation process, and those steps can vary -according to the platform and hardware setup. There is a description of +according to the platform and hardware setup. <![ %fullrel [There is a description of the manual installation process for the most common cases <ref -id="manual-install" name="below">. +id="manual-install" name="below">.]]> You must login as the super user (root) to run the installer script. Place all of the downloaded files into a single directory (choose a @@ -184,7 +218,9 @@ equivalent if it is running, before continuing. If you ignore this warning and run into problems, well, you were warned! -If you have an existing X installation, you will be warned that proceeding +<![ %fullrel [If you have an existing X installation, you]]> +<![ %updaterel [You ]]> +will be warned that proceeding with this installation will overwrite it. Only those things that are part of our standard distribution will be overwritten. Other X applications that you may have installed will not be removed. Some @@ -203,6 +239,7 @@ way of the new installation. It will list which files/directories have been removed. If none are listed, then none were removed. +<![ %fullrel [ The next step when installing over an existing version is to check for existing configuration files. As of XFree86 version 3.9.18, the run-time configuration files are installed by default under <tt>/etc/X11</tt> @@ -222,7 +259,7 @@ When installing over an existing version, you will be prompted before each set of configuration files is installed. If you haven't made any -customisations to your existing configuration files, then you can safely +Customisations to your existing configuration files, then you can safely answer "yes" for each of these. If you have made customisations, you can try answering "no". If you run into problems later, you may need to manually merge your customisations into the the new version of the @@ -273,6 +310,8 @@ ln -s /usr/X11R6/bin/rstartd /usr/bin/rstartd </verb></tscreen> +]]> + <sect1>After the installation is complete <p> The next step is to configure the X server. That is covered in detail @@ -301,6 +340,7 @@ After the X server configuration is done, it may be advisable to reboot, especially if you run xdm (or equivalent) or the font server (xfs). +<![ %fullrel [ <sect>Installing XFree86 &relvers; manually<label id="manual-install"> <p> This section describes how to manually install the XFree86 &relvers; binary @@ -426,6 +466,8 @@ /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc </verb></tscreen> + +]]> </article> Index: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml:1.7 xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml:1.7.2.1 --- xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml:1.7 Mon Mar 6 17:59:23 2000 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml Fri Mar 16 11:12:06 2001 @@ -5,10 +5,10 @@ <article> <title>Licenses The XFree86 Project -1999 +March 2001 -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.7 2000/03/06 22:59:23 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.7.2.1 2001/03/16 16:12:06 dawes Exp $ XFree86 License @@ -17,7 +17,7 @@ copyright/license:

    -Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (C) 1994-2001 The XFree86 Project, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), Index: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.59 xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.59.2.1 --- xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.59 Tue Dec 12 13:54:29 2000 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml Sun Mar 4 04:41:30 2001 @@ -9,10 +9,10 @@ Marc Wandschneider, Mark Weaver, Matthieu Herrb -Last modified on: 7 December 2000 +Last modified on: 3 March 2001 -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.59 2000/12/12 18:54:29 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.59.2.1 2001/03/04 09:41:30 herrb Exp $ @@ -20,10 +20,9 @@ What and Where is XFree86?

    -XFree86 is a port of X11R6.4 that supports several versions of -Intel-based Unix. It is derived from X386 1.2, which was the X server -distributed with X11R5. This release consists of many new features -and performance improvements as well as many bug fixes. +XFree86 is the Open Source port of X.Org's X11R6.4 release that supports +several UNIX(R) and UNIX-like (such as Linux, the BSDs and Solaris x86) +operating systems on Intel and other platforms. See the . @@ -32,7 +31,7 @@ -Binaries for NetBSD 1.3 and later are available from: +Binaries for NetBSD 1.4 and later are available from: @@ -111,7 +110,7 @@ Configuring X for Your Hardware

    -The /etc/XF86Config file tells the X server what kind of +The /etc/X11/XF86Config file tells the X server what kind of monitor, video card and mouse you have. You Your monitor's sync frequencies. - For details about the XF86Config(5) manual page. @@ -139,21 +137,22 @@ About mouse configuration +

    +XFree86 &relvers; has support for the mouse driver included in +the /dev/wsmouse0'' as the +device in /etc/X11/XF86Config if you're using NetBSD 1.4 or later +with a PS/2 mouse.

    -The NetBSD pms mouse driver handles PS/2 style mice as -Busmouse. Specify the protocol as `` Only standard PS/2 mice are supported by this driver. Newest PS/2 mice that send more than three bytes at a time (especially -Intellimouse, or MouseMan+ with a ``3D'' roller) are not supported yet. -

    -XFree86 &relvers; also has support for the mouse driver included in -the new /dev/wsmouse0'' as the -device in /etc/XF86Config if you're using NetBSD 1.4 with -wscons. +Intellimouse, or MouseMan+ with a wheel) are not supported by NetBSD +1.3 and former releases.

    See for general instruction on mouse configuration in XFree86. @@ -190,8 +189,9 @@ in /etc/rc.conf.

    -Under NetBSD 1.4 with the wscons console driver, you must enable a -virtual console for the X server first. To do this follow these steps: +Under NetBSD 1.4 and later with the wscons console driver, you must +enable a virtual console for the X server first. To do this follow +these steps: Make sure the device file exists. If not, ``cd /dev ; ./MAKEDEV wscons''. @@ -210,8 +210,8 @@ screen 5 - vt100 -(Thanks to Mason Loring Bliss <mason@acheron.middleboro.ma.us> for -this explanation) +(Thanks to Mason Loring Bliss +<mason@acheron.middleboro.ma.us> for this explanation)

    Note that the binary distributions of XFree86 for NetBSD don't include support for the XDM-AUTHORIZATION-1 protocol. @@ -239,7 +239,7 @@ contained in the NetBSD binary distribution's kernels.

    -The pcvt console driver is bundled with NetBSD. The pcvt X +The pcvt console driver was bundled with NetBSD until 1.4. The pcvt X mode is compatible with the pccons driver X mode. It offers several virtual consoles and international keyboard support. In order to use this driver, change the line: @@ -258,9 +258,9 @@

    - - You should configure the distribution by editing xc/config/cf/host.def before compiling. To compile the sources, invoke `` to xc/config/host.def before rebuilding the server. This has not been thoroughly tested, except on the macppc. +

    +For the i386, you should include both pcvt and wscons support in order +to use the pcvt compatibility mode of wscons: + + #define XFree86ConsoleDefines -DPCVT_SUPPORT -DWSCONS_SUPPORT + Building on other architectures